diff --git a/_sources/examples/guideline36-2021-4.1.md b/_sources/examples/guideline36-2021-4.1.md
index 2f5d8dac..f6446167 100644
--- a/_sources/examples/guideline36-2021-4.1.md
+++ b/_sources/examples/guideline36-2021-4.1.md
@@ -1,4 +1,4 @@
-# ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only
+# ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only
 
 This component model is an example of the variable air volume (VAV) terminal unit with cooling only from Guideline 36-2021 Section 4.1, illustrated in Figure A-1.
 
diff --git a/examples/NREL-example.html b/examples/NREL-example.html
index c86f32b5..a2a9dc49 100644
--- a/examples/NREL-example.html
+++ b/examples/NREL-example.html
@@ -65,7 +65,7 @@
     <script>DOCUMENTATION_OPTIONS.pagename = 'examples/NREL-example';</script>
     <link rel="index" title="Index" href="../genindex.html" />
     <link rel="search" title="Search" href="../search.html" />
-    <link rel="next" title="ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only" href="guideline36-2021-4.1.html" />
+    <link rel="next" title="ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only" href="guideline36-2021-4.1.html" />
     <link rel="prev" title="LBNL Example Building" href="lbnl-example.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
@@ -169,7 +169,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="nav bd-sidenav">
-<li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
@@ -556,7 +556,7 @@ <h2>Model Components<a class="headerlink" href="#model-components" title="Permal
        title="next page">
       <div class="prev-next-info">
         <p class="prev-next-subtitle">next</p>
-        <p class="prev-next-title">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</p>
+        <p class="prev-next-title">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</p>
       </div>
       <i class="fa-solid fa-angle-right"></i>
     </a>
diff --git a/examples/guideline36-2021-4.1.html b/examples/guideline36-2021-4.1.html
index d5239cde..55267912 100644
--- a/examples/guideline36-2021-4.1.html
+++ b/examples/guideline36-2021-4.1.html
@@ -9,7 +9,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only &#8212; Open223 Models</title>
+    <title>ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only &#8212; Open223 Models</title>
   
   
   
@@ -169,7 +169,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="current nav bd-sidenav">
-<li class="toctree-l1 current active"><a class="current reference internal" href="#">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1 current active"><a class="current reference internal" href="#">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
@@ -356,7 +356,7 @@
               
 
 <div id="jb-print-docs-body" class="onlyprint">
-    <h1>ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</h1>
+    <h1>ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</h1>
     <!-- Table of contents -->
     <div id="print-main-content">
         <div id="jb-print-toc">
@@ -379,8 +379,8 @@ <h2> Contents </h2>
 <div id="searchbox"></div>
                 <article class="bd-article" role="main">
                   
-  <section class="tex2jax_ignore mathjax_ignore" id="ashrae-guideline-36-2021-4-1-4-1-vav-terminal-unit-cooling-only">
-<h1>ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only<a class="headerlink" href="#ashrae-guideline-36-2021-4-1-4-1-vav-terminal-unit-cooling-only" title="Permalink to this heading">#</a></h1>
+  <section class="tex2jax_ignore mathjax_ignore" id="ashrae-guideline-36-2021-4-1-vav-terminal-unit-cooling-only">
+<h1>ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only<a class="headerlink" href="#ashrae-guideline-36-2021-4-1-vav-terminal-unit-cooling-only" title="Permalink to this heading">#</a></h1>
 <p>This component model is an example of the variable air volume (VAV) terminal unit with cooling only from Guideline 36-2021 Section 4.1, illustrated in Figure A-1.</p>
 <p><img alt="" src="../_images/g36-4.1.png" /></p>
 <section id="downloads">
diff --git a/examples/guideline36-2021-4.2.html b/examples/guideline36-2021-4.2.html
index 2366cde2..00fcad91 100644
--- a/examples/guideline36-2021-4.2.html
+++ b/examples/guideline36-2021-4.2.html
@@ -65,7 +65,7 @@
     <script>DOCUMENTATION_OPTIONS.pagename = 'examples/guideline36-2021-4.2';</script>
     <link rel="index" title="Index" href="../genindex.html" />
     <link rel="search" title="Search" href="../search.html" />
-    <link rel="prev" title="ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only" href="guideline36-2021-4.1.html" />
+    <link rel="prev" title="ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only" href="guideline36-2021-4.1.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
   </head>
@@ -168,7 +168,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="current nav bd-sidenav">
-<li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1 current active"><a class="current reference internal" href="#">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
@@ -495,7 +495,7 @@ <h2>Model Components<a class="headerlink" href="#model-components" title="Permal
       <i class="fa-solid fa-angle-left"></i>
       <div class="prev-next-info">
         <p class="prev-next-subtitle">previous</p>
-        <p class="prev-next-title">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</p>
+        <p class="prev-next-title">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</p>
       </div>
     </a>
 </div>
diff --git a/examples/lbnl-example.html b/examples/lbnl-example.html
index 59ba8553..73aac8d1 100644
--- a/examples/lbnl-example.html
+++ b/examples/lbnl-example.html
@@ -169,7 +169,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="nav bd-sidenav">
-<li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
diff --git a/genindex.html b/genindex.html
index d077d0a1..95ce46f3 100644
--- a/genindex.html
+++ b/genindex.html
@@ -168,7 +168,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="nav bd-sidenav">
-<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
diff --git a/guideline36-2021-4-1.jsonld b/guideline36-2021-4-1.jsonld
index 9de7b648..fccff962 100644
--- a/guideline36-2021-4-1.jsonld
+++ b/guideline36-2021-4-1.jsonld
@@ -11,34 +11,23 @@
         ]
     },
     {
-        "@id": "urn:ex/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/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/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#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
@@ -59,35 +48,28 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-in",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://www.w3.org/2002/07/owl#Ontology"
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-cooling-only",
+        "@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/duct-before-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
             {
                 "@id": "urn:ex/in"
+            },
+            {
+                "@id": "urn:ex/out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-before-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#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/damper"
             }
         ]
     },
@@ -108,60 +90,80 @@
         ]
     },
     {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/damper-command",
+        "@id": "urn:ex/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#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/vav-cooling-only",
+        "@id": "urn:ex/damper",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAV"
+            "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/in"
+                "@id": "urn:ex/damper-in"
             },
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/damper"
+                "@id": "urn:ex/damper-command"
+            },
+            {
+                "@id": "urn:ex/damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-out",
+        "@id": "urn:ex/in-connection",
         "@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-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/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/damper-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-damper"
+                "@id": "urn:ex/duct-before-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -171,20 +173,29 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/in"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-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"
+            }
         ]
     },
     {
@@ -204,62 +215,51 @@
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-flow",
+        "@id": "urn:ex/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/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#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/out"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-position",
+        "@id": "urn:ex/duct-before-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/damper",
+        "@id": "urn:ex/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/damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/damper-position"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     }
diff --git a/guideline36-2021-4.2.jsonld b/guideline36-2021-4.2.jsonld
index abff5737..dffc89a5 100644
--- a/guideline36-2021-4.2.jsonld
+++ b/guideline36-2021-4.2.jsonld
@@ -1,71 +1,91 @@
 [
     {
-        "@id": "urn:ex/vav-reheat",
+        "@id": "urn:ex/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/air-in"
-            },
-            {
-                "@id": "urn:ex/air-out"
-            },
+                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/hot-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/reheat-coil-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-water-out"
+                "@id": "urn:ex/hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/reheat-coil"
-            },
+                "@id": "urn:ex/hot-water-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/air-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-water-in-connection",
+        "@id": "urn:ex/air-in-connection",
         "@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-command",
+        "@id": "urn:ex/air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/air-out-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/discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/air-in-connection",
+        "@id": "urn:ex/duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -98,152 +118,170 @@
         ]
     },
     {
-        "@id": "urn:ex/air-in",
+        "@id": "urn:ex/vav-reheat",
         "@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/air-in-connection"
+                "@id": "urn:ex/air-in"
+            },
+            {
+                "@id": "urn:ex/air-out"
+            },
+            {
+                "@id": "urn:ex/hot-water-in"
+            },
+            {
+                "@id": "urn:ex/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/damper"
+            },
+            {
+                "@id": "urn:ex/reheat-coil"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/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/hot-water-out",
+        "@id": "urn:ex/air-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/air-in-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/hot-water-out-connection",
+        "@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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/air-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/air-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-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/discharge-air-flow"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-out",
+        "@id": "urn:ex/reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-water-out-connection"
+                "@id": "urn:ex/air-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/hot-water-out"
+                "@id": "urn:ex/air-out"
             }
         ]
     },
     {
-        "@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": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-position",
+        "@id": "urn:ex/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/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/hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-water-in",
+        "@id": "urn:ex/pipe-hot-water-return-before-valve",
         "@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": [
             {
@@ -252,23 +290,30 @@
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp",
+        "@id": "urn:ex/hot-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/discharge-air-temp-sensor",
+        "@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/Temperature"
+                "@id": "urn:ex/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/discharge-air-temp"
             }
         ]
     },
@@ -316,28 +361,6 @@
             }
         ]
     },
-    {
-        "@id": "urn:ex/damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
-            {
-                "@id": "urn:ex/damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
     {
         "@id": "urn:ex/discharge-air-flow",
         "@type": [
@@ -360,25 +383,35 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-out",
+        "@id": "urn:ex/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/duct-after-damper"
+                "@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#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/reheat-coil-air-in",
+        "@id": "urn:ex/damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
@@ -392,83 +425,51 @@
         ]
     },
     {
-        "@id": "urn:ex/air-out-connection",
-        "@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/reheat-coil-water-in",
+        "@id": "urn:ex/reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-water-in-connection"
+                "@id": "urn:ex/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/hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-air-out",
+        "@id": "urn:ex/reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/air-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/reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/air-out"
+                "@id": "urn:ex/reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp-sensor",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/air-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/discharge-air-temp"
-            }
+            "http://www.w3.org/2002/07/owl#Ontology"
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-water-out",
+        "@id": "urn:ex/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/pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -478,63 +479,53 @@
         ]
     },
     {
-        "@id": "urn:ex/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/reheat-coil-valve-in",
+        "@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/pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil",
+        "@id": "urn:ex/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/reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-water-in"
+                "@id": "urn:ex/damper-in"
             },
             {
-                "@id": "urn:ex/reheat-coil-water-out"
+                "@id": "urn:ex/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/damper-command"
+            },
+            {
+                "@id": "urn:ex/damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-position",
+        "@id": "urn:ex/reheat-coil-valve-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#EnumerationKind-Position"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -548,41 +539,50 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-actuator",
+        "@id": "urn:ex/reheat-coil-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/reheat-coil-valve"
+                "@id": "urn:ex/duct-after-damper"
             }
         ],
-        "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",
+        "@id": "urn:ex/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/damper-in"
-            },
+                "@id": "urn:ex/hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/damper-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/damper-command"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/damper-position"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     }
diff --git a/intro.html b/intro.html
index 6cea8e1b..9376e185 100644
--- a/intro.html
+++ b/intro.html
@@ -168,7 +168,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="nav bd-sidenav">
-<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
@@ -402,7 +402,7 @@ <h2>Table of Contents<a class="headerlink" href="#table-of-contents" title="Perm
 <div class="toctree-wrapper compound">
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 </div>
diff --git a/lbnl-example.jsonld b/lbnl-example.jsonld
index b80e4f9f..2ebae1ee 100644
--- a/lbnl-example.jsonld
+++ b/lbnl-example.jsonld
@@ -1,73 +1,43 @@
 [
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-529-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-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": "urn:ex/zone-309-310-occupancy-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-309-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/zone-309-310-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-507-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-529-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-occupancy",
+        "@id": "urn:ex/vav-524-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-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
-        ]
-    },
-    {
-        "@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://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-more-heat-requests",
+        "@id": "urn:ex/vav-540-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -78,13 +48,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-hot-water-in",
+        "@id": "urn:ex/vav-525-hot-water-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/vav-525-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -94,153 +64,164 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-temp-sensor",
+        "@id": "urn:ex/vav-525-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-112-hvac-domain"
+                "@id": "urn:ex/vav-525-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/zone-112-114-temp"
+                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-hot-water-in",
+        "@id": "urn:ex/vav-533-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-503-hot-water-in-connection"
+                "@id": "urn:ex/vav-533-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-533-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-air-in",
+        "@id": "urn:ex/vav-501",
         "@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-527-duct-after-damper"
+                "@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://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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-518-discharge-air-temp",
+        "@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://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/zone-204-205-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-502-reheat-coil-water-in",
+        "@id": "urn:ex/vav-527-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-502-hot-water-in-connection"
+                "@id": "urn:ex/vav-527-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-502-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-515-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-515-air-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-311-occupancy",
-        "@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-Occupancy"
+                "@id": "urn:ex/vav-515-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-colder-supply-air-requests",
+        "@id": "urn:ex/zone-307-308-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/room-307-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-307-308-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-command",
+        "@id": "urn:ex/vav-509-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/office-ahu-ra-fan-in",
+        "@id": "urn:ex/vav-519-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-from-rooms"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -248,115 +229,121 @@
                 "@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-ra-in"
+                "@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/connection-to-room-313",
+        "@id": "urn:ex/vav-522-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/vav-522-damper"
             }
-        ]
-    },
-    {
-        "@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#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-522-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-temp",
+        "@id": "urn:ex/vav-513-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/Temperature"
+                "@id": "urn:ex/vav-513-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-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-513-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-513-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-air-out",
+        "@id": "urn:ex/vav-534-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/connection-to-room-102"
+                "@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/room-305",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-501-discharge-air-temp-setpoint"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-heating-setpoint",
+        "@id": "urn:ex/vav-503-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-517-reheat-coil",
+        "@id": "urn:ex/vav-505-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-517-reheat-coil-air-in"
+                "@id": "urn:ex/vav-505-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-517-reheat-coil-air-out"
+                "@id": "urn:ex/vav-505-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-517-reheat-coil-water-in"
+                "@id": "urn:ex/vav-505-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-517-reheat-coil-water-out"
+                "@id": "urn:ex/vav-505-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -366,166 +353,186 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-occupancy-override",
+        "@id": "urn:ex/vav-533-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": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-518-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-531-damper-out",
+        "@id": "urn:ex/zone-313-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-531-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-305",
+        "@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#hasProperty": [
-            {
-                "@id": "urn:ex/vav-531-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-531-cooling-pid-output"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-cooling-pid-output",
+        "@id": "urn:ex/vav-508-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/office-ahu",
+        "@id": "urn:ex/vav-506-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
+            "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-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/vav-506-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/office-ahu-sa-out"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-out"
             }
         ],
-        "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"
-            },
-            {
-                "@id": "urn:ex/office-ahu-htg-coil"
-            },
-            {
-                "@id": "urn:ex/office-ahu-htg-coil-valve"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-moisture-eliminator"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/office-ahu-ra-damper"
-            },
+                "@id": "urn:ex/vav-506-reheat-coil-valve-position"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-517-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-ra-fan"
-            },
+                "@id": "urn:ex/vav-517-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-sa-fan"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-temp-sensor",
+        "@id": "urn:ex/zone-112-114-occupancy",
         "@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/room-301-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve",
+        "@type": [
+            "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-301-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper",
+        "@id": "urn:ex/vav-520-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-518-damper-in"
+                "@id": "urn:ex/vav-520-damper-in"
             },
             {
-                "@id": "urn:ex/vav-518-damper-out"
+                "@id": "urn:ex/vav-520-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-518-damper-command"
+                "@id": "urn:ex/vav-520-damper-command"
             },
             {
-                "@id": "urn:ex/vav-518-damper-position"
+                "@id": "urn:ex/vav-520-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-507-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-507-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/zone-108-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -539,220 +546,212 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-101-co2-sensor",
+        "@id": "urn:ex/vav-516-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-101-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-101-co2-concentration"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-flow-sensor",
+        "@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-526-air-in"
+                "@id": "urn:ex/vav-522-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-flow"
+                "@id": "urn:ex/vav-522-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-in-connection",
+        "@id": "urn:ex/vav-506-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-538-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/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-213",
+        "@id": "urn:ex/room-104",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-213-hvac-domain"
+                "@id": "urn:ex/room-104-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-202-hvac-domain",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-202-in"
-            },
-            {
-                "@id": "urn:ex/room-202-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-535-reheat-coil-air-out",
+        "@id": "urn:ex/vav-529-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-311"
-            }
-        ],
-        "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-535-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-535-more-heat-requests"
+                "@id": "urn:ex/vav-529-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-535-air-out"
+                "@id": "urn:ex/vav-529-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-hot-water-out-connection",
+        "@id": "urn:ex/vav-535-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-535-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-118-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#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-535-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-window-switch-on-off",
+        "@id": "urn:ex/vav-533-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-533-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-ea-damper-position",
+        "@id": "urn:ex/vav-514-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-516-discharge-air-flow-sensor",
+        "@id": "urn:ex/office-ahu-moisture-eliminator-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-516-air-in"
+                "@id": "urn:ex/office-ahu-oa-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-516-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/office-ahu-oa-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-water-out",
+        "@id": "urn:ex/vav-514-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
+                "@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/connection-to-room-110",
+        "@id": "urn:ex/vav-538-discharge-air-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/vav-538-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-538-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-occupancy-override",
+        "@id": "urn:ex/zone-301-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -763,83 +762,85 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-533-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-533-more-heat-requests",
+        "@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-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-occupancy",
+        "@id": "urn:ex/zone-303-304-306-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/room-303-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-303-304-306-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-air-in",
+        "@id": "urn:ex/vav-520-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-524-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-207"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-303-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/connection-to-room-303-304-306"
+                "@id": "urn:ex/vav-520-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-520-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-520-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-out",
+        "@id": "urn:ex/vav-518-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-202"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -849,175 +850,156 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-colder-supply-air-requests"
+                "@id": "urn:ex/vav-518-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-535-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-302-co2-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-302-hvac-domain"
+                "@id": "urn:ex/vav-518-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-302-co2-concentration"
+                "@id": "urn:ex/vav-518-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-509-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve"
+                "@id": "urn:ex/vav-509-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-509-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-537-reheat-coil-water-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/vav-537-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-511-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-temp",
+        "@id": "urn:ex/room-307-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-307-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-307-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/room-209",
+        "@id": "urn:ex/vav-513",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-209-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-damper-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-513-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-513-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-513-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-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-513-damper"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-heating-setpoint",
+        "@id": "urn:ex/office-ahu-sa-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-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-521-hot-water-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-521-hot-water-in-connection"
+                "@id": "urn:ex/vav-538-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-208-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": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-538-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-occupancy-override",
+        "@id": "urn:ex/zone-113-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/office-ahu-ra-fan-speed-cmd",
+        "@id": "urn:ex/vav-535-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -1033,156 +1015,121 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-hot-water-out-connection",
+        "@id": "urn:ex/vav-531-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#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/connection-to-room-307-308"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-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/vav-505-reheat-coil-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-505-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-531-discharge-air-flow"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-531-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-505-hot-water-in"
+                "@id": "urn:ex/vav-531-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-531-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-water-in",
+        "@id": "urn:ex/vav-535-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-521-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-535-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-521-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-out",
+        "@id": "urn:ex/zone-111-cooling-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/zone-204-205-occupancy-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/room-204-hvac-domain"
+                "@id": "urn:ex/vav-524-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-204-205-occupancy"
+                "@id": "urn:ex/vav-524-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-occupancy-override",
+        "@id": "urn:ex/vav-503-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/vav-540-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/vav-503-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/vav-503-reheat-coil-air-out"
+            },
             {
-                "@id": "urn:ex/vav-530-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-503-reheat-coil-water-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-503-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-530-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-colder-supply-air-requests",
+        "@id": "urn:ex/vav-526-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -1193,25 +1140,14 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-water-out",
+        "@id": "urn:ex/vav-526-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-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/zone-206-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -1225,41 +1161,40 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve",
+        "@id": "urn:ex/vav-536-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-528-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "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/zone-102-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-air-out",
+        "@id": "urn:ex/vav-513-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-103"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1269,139 +1204,111 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-536-heating-pid-output"
+                "@id": "urn:ex/vav-513-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-536-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-513-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-536-air-out"
+                "@id": "urn:ex/vav-513-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-513-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-527-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-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-530-reheat-coil-air-out",
+        "@id": "urn:ex/room-211-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-303-304-306"
-            }
-        ],
-        "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-heating-pid-output"
+                "@id": "urn:ex/room-211-in"
             },
             {
-                "@id": "urn:ex/vav-530-more-heat-requests"
+                "@id": "urn:ex/room-211-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-530-air-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-temp",
+        "@id": "urn:ex/vav-503-reheat-coil-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/Temperature"
+                "@id": "urn:ex/vav-503-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-509-reheat-coil-valve-command",
+        "@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": [
             {
-                "@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-214-hvac-domain",
+        "@id": "urn:ex/vav-528-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-214-in"
-            },
-            {
-                "@id": "urn:ex/room-214-out"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-526-discharge-air-flow-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-505-discharge-air-temp",
+        "@id": "urn:ex/zone-211-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": [
             {
@@ -1415,80 +1322,80 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-in",
+        "@id": "urn:ex/vav-529-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-523-hot-water-in-connection"
+                "@id": "urn:ex/vav-529-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-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-529-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/office-ahu-increased-air-pressure-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-534-air-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/office-ahu-connection-to-vavs"
+                "@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": "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-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-518-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-314-cooling-setpoint",
+        "@id": "urn:ex/zone-307-308-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -1502,55 +1409,39 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-526-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-532-air-in"
+                "@id": "urn:ex/vav-526-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-532-discharge-air-flow"
+                "@id": "urn:ex/vav-526-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512",
+        "@id": "urn:ex/office-ahu-sa-fan-speed-cmd",
         "@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-512-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-512-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-512-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-512-damper"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-command",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -1566,41 +1457,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-heating-pid-output",
+        "@id": "urn:ex/office-ahu-supply-duct-static-pressure",
         "@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/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-510-damper-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-507-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-507-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-command",
+        "@id": "urn:ex/office-ahu-oa-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -1614,43 +1510,50 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-in-connection",
+        "@id": "urn:ex/zone-309-310-temp-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-309-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-309-310-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-out",
+        "@id": "urn:ex/vav-530-more-heat-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-507-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-air-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/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-507-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-position",
+        "@id": "urn:ex/vav-527-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -1666,110 +1569,119 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-532-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/vav-502-air-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-532-reheat-coil-air-in"
+            },
             {
-                "@id": "urn:ex/vav-502-discharge-air-temp"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-214-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/vav-532-reheat-coil-air-out"
+            },
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-532-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-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/vav-530-reheat-coil-water-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-530-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-507-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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#mapsTo": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-530-hot-water-in"
+                "@id": "urn:ex/vav-507-damper"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-305-in",
+        "@id": "urn:ex/vav-534-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/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-505-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-538-hot-water-out-connection",
+        "@id": "urn:ex/zone-103-heating-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-534-air-out",
+        "@id": "urn:ex/vav-510-reheat-coil-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-111"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1779,345 +1691,302 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-534-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-510-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-534-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-510-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-510-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-522-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/vav-514-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-507-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-517-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-203-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-203-in"
+            },
+            {
+                "@id": "urn:ex/room-203-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-524-cooling-pid-output",
+        "@id": "urn:ex/vav-501-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-501-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-501-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-211-out",
+        "@id": "urn:ex/zone-302",
         "@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-302-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/office-ahu-ra-damper-position",
-        "@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/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-302-co2-concentration"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-515-discharge-air-flow-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/zone-302-co2-concentration-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-302-cooling-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@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-528-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-540-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/vav-528-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/connection-to-room-314",
+        "@id": "urn:ex/zone-305-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/vav-531-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve"
+                "@id": "urn:ex/vav-537-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-occupancy",
+        "@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-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-water-out",
+        "@id": "urn:ex/vav-504-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-512-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-504-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-504-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-504-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-504-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil",
+        "@id": "urn:ex/zone-303-304-306-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-510-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-510-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-530",
+        "@id": "urn:ex/vav-522-discharge-air-temp-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-530-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-530-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-530-damper"
-            },
-            {
-                "@id": "urn:ex/vav-530-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-heating-setpoint",
+        "@id": "urn:ex/zone-111-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-111-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-111-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510",
+        "@id": "urn:ex/zone-314-window-switch-on-off",
         "@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-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://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-510-damper"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-water-out",
+        "@id": "urn:ex/zone-110-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-540-pipe-hot-water-return-before-valve"
+                "@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/room-308-in",
+        "@id": "urn:ex/vav-533-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/connection-to-room-307-308"
+                "@id": "urn:ex/vav-533-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-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-533-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-533-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-temp",
+        "@id": "urn:ex/zone-110-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": [
             {
@@ -2131,128 +2000,139 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-527-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/vav-527-air-out"
+                "@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"
+            },
+            {
+                "@id": "urn:ex/vav-527-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-527-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-air-in",
+        "@id": "urn:ex/vav-520",
         "@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-535-duct-after-damper"
+                "@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#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-520-damper"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-in-connection",
+        "@id": "urn:ex/vav-503-discharge-air-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/vav-503-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-503-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305",
+        "@id": "urn:ex/connection-to-room-105",
         "@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-305-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-discharge-air-temp-sensor",
+        "@type": [
+            "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:ex/vav-513-air-out"
             }
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-305-window-switch-on-off"
+                "@id": "urn:ex/vav-513-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-out",
+        "@id": "urn:ex/room-206-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-503-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-206-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-206-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-503-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-503-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-heating-setpoint",
+        "@id": "urn:ex/room-114",
         "@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-114-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-command",
+        "@id": "urn:ex/vav-539-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -2268,39 +2148,18 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513",
+        "@id": "urn:ex/vav-511-more-heat-requests",
         "@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-513-air-in"
-            },
-            {
-                "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-513-damper"
-            },
-            {
-                "@id": "urn:ex/vav-513-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-temp",
+        "@id": "urn:ex/vav-523-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -2311,151 +2170,157 @@
         ],
         "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-516-reheat-coil-air-in",
+        "@id": "urn:ex/room-314-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-516-duct-after-damper"
+                "@id": "urn:ex/room-314-in"
+            },
+            {
+                "@id": "urn:ex/room-314-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-532-damper-out",
+        "@id": "urn:ex/vav-536-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-532-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-536-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-536-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-532-colder-supply-air-requests"
+                "@id": "urn:ex/vav-536-damper-command"
             },
             {
-                "@id": "urn:ex/vav-532-cooling-pid-output"
+                "@id": "urn:ex/vav-536-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-hot-water-in",
+        "@id": "urn:ex/room-304-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/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/zone-112-114-cooling-setpoint",
+        "@id": "urn:ex/vav-506-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-506-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-506-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-506-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-506-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-heating-pid-output",
+        "@id": "urn:ex/vav-501-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/vav-539-damper-out",
+        "@id": "urn:ex/vav-515-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-539-duct-after-damper"
+                "@id": "urn:ex/vav-515-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-539-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-539-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-heating-setpoint",
+        "@id": "urn:ex/vav-538-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-513-hot-water-in",
+        "@id": "urn:ex/vav-509-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-513-hot-water-in-connection"
+                "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2465,101 +2330,94 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-102",
+        "@id": "urn:ex/room-215-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-102-hvac-domain"
+                "@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/vav-534-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-102-cooling-setpoint"
-            },
+                "@id": "urn:ex/connection-to-room-314"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-102-heating-setpoint"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-102-occupancy"
+                "@id": "urn:ex/vav-534-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/zone-102-occupancy-override"
+                "@id": "urn:ex/vav-534-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/zone-102-temp"
+                "@id": "urn:ex/vav-534-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/zone-102-window-switch-on-off"
+                "@id": "urn:ex/vav-534-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-516-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-519-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-503-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-519-air-in"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-discharge-air-flow"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-clg-coil-water-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-pipe-chilled-water-return-before-valve"
+                "@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-Water"
+                "@id": "urn:ex/vav-503-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-204-hvac-domain",
+        "@id": "urn:ex/room-303-hvac-domain",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-204-in"
+                "@id": "urn:ex/room-303-in"
             },
             {
-                "@id": "urn:ex/room-204-out"
+                "@id": "urn:ex/room-303-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -2569,63 +2427,81 @@
         ]
     },
     {
-        "@id": "urn:ex/room-212-hvac-domain",
+        "@id": "urn:ex/vav-524-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-212-in"
-            },
+                "@id": "urn:ex/connection-to-room-210"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-212-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/vav-524-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-524-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-524-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-524-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-501-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-537-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-501-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-501-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-hot-water-out"
+                "@id": "urn:ex/vav-501-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-501-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-101-co2-concentration-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-in",
+        "@id": "urn:ex/vav-515-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -2638,72 +2514,132 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@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-524-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-509-air-in"
+                "@id": "urn:ex/vav-524-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-air-out",
+        "@id": "urn:ex/room-214-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-302"
+                "@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-511-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-528-heating-pid-output"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-528-more-heat-requests"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-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-528-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-536-reheat-coil-valve",
+        "@id": "urn:ex/vav-510",
         "@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-510-air-in"
             },
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-510-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-510-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-510-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-510-damper"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil-valve"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-538-discharge-air-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-position"
+                "@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-520-hot-water-in-connection",
+        "@id": "urn:ex/vav-507-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -2715,289 +2651,314 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-colder-supply-air-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "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/zone-214-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-colder-chilled-water-requests",
+        "@id": "urn:ex/vav-520-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/zone-203-occupancy-sensor",
+        "@id": "urn:ex/vav-538-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-203-hvac-domain"
+                "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-203-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-water-in",
+        "@id": "urn:ex/vav-520-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-512-hot-water-in-connection"
+                "@id": "urn:ex/vav-520-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-512-hot-water-in"
+                "@id": "urn:ex/vav-520-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-520-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-duct-after-damper",
+        "@id": "urn:ex/office-ahu-clg-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/office-ahu-clg-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-heating-pid-output",
+        "@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": [
             {
-                "@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-204-205-temp",
+        "@id": "urn:ex/vav-523-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/Temperature"
+                "@id": "urn:ex/vav-523-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-523-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-air-out",
+        "@id": "urn:ex/vav-539-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-212"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-539-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-539-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-526-heating-pid-output"
+                "@id": "urn:ex/vav-539-damper-command"
             },
             {
-                "@id": "urn:ex/vav-526-more-heat-requests"
+                "@id": "urn:ex/vav-539-damper-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-314-occupancy-override",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-526-air-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-cooling-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/vav-501-reheat-coil",
+        "@id": "urn:ex/vav-501-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-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-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-501-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-temp-sensor",
+        "@id": "urn:ex/zone-104-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-309-hvac-domain"
+                "@id": "urn:ex/room-104-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-309-310-temp"
+                "@id": "urn:ex/zone-104-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-hot-water-in",
+        "@id": "urn:ex/zone-210-temp",
         "@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-522-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-503-air-in",
+        "@id": "urn:ex/vav-501-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-211",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/room-211-hvac-domain"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-air-out",
+        "@id": "urn:ex/vav-503-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/connection-to-room-115"
+                "@id": "urn:ex/vav-503-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-503-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-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-514-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-514-discharge-air-temp"
+                "@id": "urn:ex/vav-503-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-514-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-503-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-cooling-pid-output",
+        "@id": "urn:ex/vav-501-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-534-hot-water-out-connection",
+        "@id": "urn:ex/vav-535-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-535-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -3006,41 +2967,58 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-command",
+        "@id": "urn:ex/vav-510-colder-supply-air-requests",
         "@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/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-202",
+        "@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/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-heating-setpoint",
+        "@id": "urn:ex/vav-538-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-538-reheat-coil-air-in"
+            },
+            {
+                "@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://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-311-temp",
+        "@id": "urn:ex/zone-116-117-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -3054,62 +3032,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-525-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-518-air-in"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-discharge-air-flow"
+                "@id": "urn:ex/vav-525-hot-water-out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-504-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-504-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-504-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-525-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper-position",
+        "@id": "urn:ex/vav-536-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-discharge-air-flow",
+        "@id": "urn:ex/vav-512-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": [
             {
@@ -3123,25 +3085,25 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-heating-setpoint",
+        "@id": "urn:ex/room-110-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-504-damper-command",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -3155,26 +3117,30 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-540-discharge-air-flow-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-516-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-duct-after-damper",
+        "@id": "urn:ex/room-206-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": [
             {
@@ -3183,89 +3149,99 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-110-occupancy-override",
+        "@id": "urn:ex/vav-508-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-Override"
+                "@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-504-reheat-coil-valve-in",
+        "@id": "urn:ex/room-311-in",
         "@type": [
             "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/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"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-209-out",
+        "@id": "urn:ex/room-307",
         "@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#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-307-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-actuator",
+        "@id": "urn:ex/zone-111-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-523-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-523-damper-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper",
+        "@id": "urn:ex/vav-534-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": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-504-damper-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-504-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-damper-command"
-            },
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-533-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-504-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-112-114-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -3281,151 +3257,128 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-air-in",
+        "@id": "urn:ex/zone-302-temp",
         "@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-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/room-108-in",
+        "@id": "urn:ex/room-207",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-108"
-            }
+            "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:ex/room-207-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil",
+        "@id": "urn:ex/vav-526-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-536-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-536-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-536-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-536-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/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-sa-fan-start-cmd",
-        "@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-OnOff"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-in",
+        "@id": "urn:ex/vav-539-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#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#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-524-air-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-air-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/vav-515-duct-after-damper"
+                "@id": "urn:ex/room-118-in"
+            },
+            {
+                "@id": "urn:ex/room-118-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-514-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-535-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/vav-514-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-514-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304-out",
+        "@id": "urn:ex/vav-524-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-516-air-out",
+        "@id": "urn:ex/vav-509-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-201"
+                "@id": "urn:ex/connection-to-room-113"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3435,244 +3388,309 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-516-discharge-air-flow"
+                "@id": "urn:ex/vav-509-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-516-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-509-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-516-discharge-air-temp"
+                "@id": "urn:ex/vav-509-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-516-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-509-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-water-in",
+        "@id": "urn:ex/vav-502-damper-position",
         "@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/DimensionlessRatio"
             }
         ],
-        "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/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-occupancy",
+        "@id": "urn:ex/zone-203",
         "@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-Occupancy"
+                "@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#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"
+            },
+            {
+                "@id": "urn:ex/zone-203-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-308",
+        "@id": "urn:ex/vav-523-reheat-coil-valve-command",
         "@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/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-cooling-setpoint",
+        "@id": "urn:ex/vav-523-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-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"
             }
         ],
-        "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-510-reheat-coil-valve-in",
+        "@id": "urn:ex/room-111-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-111"
             }
         ],
         "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-215-temp",
+        "@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/Temperature"
+                "@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/DEG_C"
+                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-duct-after-damper",
+        "@id": "urn:ex/room-312",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "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:ex/room-312-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-air-out",
+        "@id": "urn:ex/zone-203-heating-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/connection-to-room-301"
+                "@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-504-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-527-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-more-heat-requests"
+                "@id": "urn:ex/vav-504-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-527-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-531-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-531-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-531-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-307-in",
+        "@id": "urn:ex/vav-539-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/connection-to-room-307-308"
+                "@id": "urn:ex/vav-539-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-539-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-power",
+        "@id": "urn:ex/vav-517-damper-position",
         "@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/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-hot-water-in",
+        "@id": "urn:ex/zone-105-occupancy",
         "@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-Occupancy"
+            }
+        ]
+    },
+    {
+        "@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-502-hot-water-in-connection"
+                "@id": "urn:ex/vav-521-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-521-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-521-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-521-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-521-damper"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-in",
+        "@id": "urn:ex/vav-511-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-537-air-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-out",
+        "@id": "urn:ex/vav-526-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-duct-after-damper"
+                "@id": "urn:ex/vav-526-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3682,89 +3700,62 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-521-colder-supply-air-requests"
+                "@id": "urn:ex/vav-526-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-521-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@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": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-526-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-501-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-537",
+        "@id": "urn:ex/vav-535-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-537-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-537-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-537-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-537-hot-water-out"
+                "@id": "urn:ex/vav-535-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-537-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil"
+                "@id": "urn:ex/vav-535-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve"
+                "@id": "urn:ex/vav-535-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-206",
+        "@id": "urn:ex/office-ahu-hot-water-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/office-ahu-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@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": [
             {
@@ -3773,23 +3764,19 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-cooling-setpoint",
+        "@id": "urn:ex/connection-to-room-103",
         "@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-524-damper-position",
+        "@id": "urn:ex/vav-520-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -3805,418 +3792,473 @@
         ]
     },
     {
-        "@id": "urn:ex/room-302-out",
+        "@id": "urn:ex/zone-112-114",
         "@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-112-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-114-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-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"
+            },
+            {
+                "@id": "urn:ex/zone-112-114-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-co2-concentration-setpoint",
+        "@id": "urn:ex/vav-525-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://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-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-discharge-air-flow-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/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-313-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-air-in",
+        "@id": "urn:ex/vav-506-reheat-coil-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-506-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-506-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-occupancy",
+        "@id": "urn:ex/office-ahu-pipe-chilled-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-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-occupancy-sensor",
+        "@id": "urn:ex/zone-103-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-111-hvac-domain"
+                "@id": "urn:ex/room-103-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-111-occupancy"
+                "@id": "urn:ex/zone-103-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-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/vav-532-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-532-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-532-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-532-damper-position"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-air-filter",
+        "@id": "urn:ex/vav-525-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-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-501-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-530-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-501-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-530-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-530-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-204-out",
+        "@id": "urn:ex/vav-526-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/office-ahu-connection-from-rooms"
+                "@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-528-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-528-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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ma-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-528-hot-water-out"
+                "@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-out",
+        "@id": "urn:ex/vav-503-damper-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/vav-503-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-503-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-503-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-speed-status",
+        "@id": "urn:ex/office-ahu-oa-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
+            }
+        ],
         "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-530-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-533-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-505",
+        "@id": "urn:ex/zone-101-heating-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-505-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-505-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-505-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-505-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-505-damper"
-            },
-            {
-                "@id": "urn:ex/vav-505-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-water-out",
+        "@id": "urn:ex/zone-202-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-502-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/connection-to-room-204-205",
+        "@id": "urn:ex/vav-524-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"
+            }
+        ],
+        "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-511-colder-supply-air-requests",
+        "@id": "urn:ex/vav-511-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-509-reheat-coil-air-out",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-113"
+                "@id": "urn:ex/vav-519-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-509-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-509-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-509-air-out"
+                "@id": "urn:ex/vav-519-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-occupancy",
+        "@id": "urn:ex/office-ahu-oa-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/office-ahu-oa-damper-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/office-ahu-oa-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-occupancy-override",
+        "@id": "urn:ex/vav-532-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-Override"
+                "@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-532-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-cooling-pid-output",
+        "@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/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-heating-pid-output",
+        "@id": "urn:ex/vav-540-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-540-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-540-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-hot-water-in-connection",
+        "@id": "urn:ex/vav-517-discharge-air-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/vav-517-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-517-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-hot-water-out-connection",
+        "@id": "urn:ex/zone-101-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-523-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-523-hot-water-out-connection"
+                "@id": "urn:ex/vav-527-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -4226,70 +4268,69 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-523-hot-water-out"
+                "@id": "urn:ex/vav-527-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-505-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-538-hot-water-out-connection"
+                "@id": "urn:ex/vav-505-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-538-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-supply-duct-static-pressure",
+        "@id": "urn:ex/connection-to-room-313",
         "@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"
-            }
+            "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/vav-521-reheat-coil-water-out",
+        "@id": "urn:ex/vav-508-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve"
+                "@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"
+            }
+        ],
+        "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/vav-534-cooling-pid-output",
+        "@id": "urn:ex/vav-536-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4305,53 +4346,68 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-command",
+        "@id": "urn:ex/zone-305-occupancy-override",
         "@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/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-215-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/zone-213-heating-setpoint",
+        "@id": "urn:ex/vav-523-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-523-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-508-more-heat-requests",
+        "@id": "urn:ex/vav-517-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-517-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-517-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-210",
+        "@id": "urn:ex/room-210-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": [
             {
@@ -4360,229 +4416,244 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-actuator",
+        "@id": "urn:ex/zone-302-co2-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-520-damper"
+                "@id": "urn:ex/room-302-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-520-damper-command"
+                "@id": "urn:ex/zone-302-co2-concentration"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper",
+        "@id": "urn:ex/vav-524-reheat-coil-air-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-521-damper-in"
-            },
+                "@id": "urn:ex/connection-to-room-210"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-521-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-521-damper-command"
+                "@id": "urn:ex/vav-524-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-521-damper-position"
+                "@id": "urn:ex/vav-524-more-heat-requests"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-518-more-heat-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/vav-524-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-cooling-setpoint",
+        "@id": "urn:ex/vav-536-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-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://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/office-ahu-ra-damper",
+        "@id": "urn:ex/vav-506-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/office-ahu-ra-damper-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-damper-out"
+                "@id": "urn:ex/vav-506-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-ra-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-ra-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
+                "@id": "urn:ex/vav-506-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-flow-setpoint",
+        "@id": "urn:ex/room-102",
         "@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#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-102-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-502-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-101"
             }
         ],
-        "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-507",
-        "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-507-air-in"
+                "@id": "urn:ex/vav-502-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-507-air-out"
+                "@id": "urn:ex/vav-502-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-507-hot-water-in"
+                "@id": "urn:ex/vav-502-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-507-hot-water-out"
+                "@id": "urn:ex/vav-502-discharge-air-temp-setpoint"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-damper"
-            },
+                "@id": "urn:ex/vav-523-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-523-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve"
+                "@id": "urn:ex/vav-523-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-528-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-528-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-528-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-108-occupancy",
         "@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-535-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-502-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-502-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-535-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-506-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-506-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-506-damper-command",
+        "@id": "urn:ex/vav-529-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-529-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-529-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-position",
+        "@id": "urn:ex/vav-533-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4598,89 +4669,112 @@
         ]
     },
     {
-        "@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/vav-503-heating-pid-output",
+        "@id": "urn:ex/vav-501-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-501-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-525-reheat-coil-water-out",
+        "@id": "urn:ex/vav-507-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-110"
             }
         ],
         "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-507-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-507-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-507-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-507-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-colder-supply-air-requests",
+        "@id": "urn:ex/zone-206-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/room-206-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-206-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-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-510-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#hasProperty": [
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-air-in",
+        "@id": "urn:ex/vav-524-duct-after-damper",
         "@type": [
-            "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#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -4689,28 +4783,35 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-out",
+        "@id": "urn:ex/room-303-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/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-536-duct-after-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-512-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-duct-after-damper",
+        "@id": "urn:ex/connection-to-room-307-308",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -4722,7 +4823,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-540-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -4734,121 +4835,192 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107",
+        "@id": "urn:ex/vav-522-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-106-hvac-domain"
+                "@id": "urn:ex/vav-522-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/room-107-hvac-domain"
+                "@id": "urn:ex/vav-522-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-106-107-cooling-setpoint"
+                "@id": "urn:ex/vav-522-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/zone-106-107-heating-setpoint"
-            },
+                "@id": "urn:ex/vav-522-reheat-coil-valve-position"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-529-hot-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-106-107-occupancy"
-            },
+                "@id": "urn:ex/vav-529-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-106-107-occupancy-override"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505-discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/zone-106-107-temp"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/zone-106-107-window-switch-on-off"
+                "@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-power",
+        "@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/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-529-reheat-coil",
+        "@id": "urn:ex/vav-517-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/vav-529-reheat-coil-air-in"
-            },
+                "@id": "urn:ex/vav-517-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-water-in"
+                "@id": "urn:ex/vav-517-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil-water-out"
+                "@id": "urn:ex/vav-517-cooling-pid-output"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-108-occupancy-override",
+        "@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-Heating"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-air-in",
+        "@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://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-reheat-coil-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-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#mapsTo": [
+            {
+                "@id": "urn:ex/vav-512-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-heating-setpoint",
+        "@id": "urn:ex/zone-203-occupancy-override",
         "@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-Override"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-527-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/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-536-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -4860,23 +5032,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil",
+        "@id": "urn:ex/vav-510-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/vav-510-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-air-out"
+                "@id": "urn:ex/vav-510-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-water-in"
+                "@id": "urn:ex/vav-510-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-water-out"
+                "@id": "urn:ex/vav-510-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -4886,118 +5058,100 @@
         ]
     },
     {
-        "@id": "urn:ex/room-301",
+        "@id": "urn:ex/zone-303-304-306-window-switch-on-off",
         "@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-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-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-301"
-            }
-        ],
-        "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-discharge-air-flow"
+                "@id": "urn:ex/vav-522-air-in"
             },
             {
-                "@id": "urn:ex/vav-527-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-522-air-out"
             },
             {
-                "@id": "urn:ex/vav-527-discharge-air-temp"
+                "@id": "urn:ex/vav-522-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-527-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-522-hot-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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-522-damper"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-522-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-temp",
+        "@id": "urn:ex/vav-537-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/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-515-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-537-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-515-air-in"
+                "@id": "urn:ex/vav-537-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-515-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-515-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
+            },
             {
-                "@id": "urn:ex/vav-515-damper-command"
+                "@id": "urn:ex/vav-537-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-in",
+        "@id": "urn:ex/vav-534-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-534-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5007,49 +5161,56 @@
         ]
     },
     {
-        "@id": "urn:ex/room-104-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/connection-to-room-104"
+                "@id": "urn:ex/connection-to-room-118"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "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"
+            },
+            {
+                "@id": "urn:ex/vav-512-discharge-air-temp-setpoint"
+            }
         ]
     },
     {
-        "@id": "urn:ex/room-115-hvac-domain",
+        "@id": "urn:ex/vav-540-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-115-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-115-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-515-reheat-coil-water-out",
+        "@id": "urn:ex/vav-511-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5058,237 +5219,197 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527",
+        "@id": "urn:ex/zone-309-310-occupancy-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-527-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-527-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-527-hot-water-out"
+                "@id": "urn:ex/room-309-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-527-damper"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-valve"
+                "@id": "urn:ex/zone-309-310-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-105-window-switch-on-off",
         "@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-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-air-out",
+        "@id": "urn:ex/vav-519-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-118"
+                "@id": "urn:ex/vav-519-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-512-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-512-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-512-air-out"
+                "@id": "urn:ex/vav-519-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-flow-setpoint",
+        "@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/VolumeFlowRate"
+                "@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/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-position",
+        "@id": "urn:ex/room-106",
         "@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#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/room-106-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-discharge-air-temp",
+        "@id": "urn:ex/vav-508-air-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/connection-to-room-109"
             }
         ],
-        "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-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/room-309-in",
+        "@id": "urn:ex/vav-517-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-309-310"
-            }
+            "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-505-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-505-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-505-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-speed-status",
+        "@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/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/office-ahu-htg-coil-valve",
+        "@id": "urn:ex/vav-529-reheat-coil-water-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/vav-529-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@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": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-out",
+        "@id": "urn:ex/vav-501-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-516-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://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-516-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-516-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-521-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -5304,45 +5425,39 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-position",
+        "@id": "urn:ex/zone-313-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-313-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-313-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-window-switch-on-off",
+        "@id": "urn:ex/vav-533-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-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-509-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/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-occupancy-override",
+        "@id": "urn:ex/zone-309-310-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -5353,163 +5468,115 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504",
+        "@id": "urn:ex/vav-522-cooling-pid-output",
         "@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-504-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-504-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-504-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-504-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-504-damper"
-            },
-            {
-                "@id": "urn:ex/vav-504-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-air-in",
+        "@id": "urn:ex/vav-515-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-519-duct-after-damper"
+                "@id": "urn:ex/vav-515-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-515-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-command",
+        "@id": "urn:ex/office-ahu-clg-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/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-pipe-chilled-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/office-ahu-sa-fan",
+        "@id": "urn:ex/vav-536-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "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#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"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-start-status"
+                "@id": "urn:ex/vav-536-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-duct-after-damper",
+        "@id": "urn:ex/zone-314-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-512-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-301-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-508-discharge-air-temp",
+        "@id": "urn:ex/vav-529-cooling-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/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-536-hot-water-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/vav-536-hot-water-out-connection"
+                "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5519,109 +5586,109 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-518-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-540-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-540-reheat-coil-valve-command"
+                "@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-512-damper-position",
+        "@id": "urn:ex/zone-305-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-539-discharge-air-flow",
+        "@id": "urn:ex/vav-515-reheat-coil-valve-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-515-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-116-117-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-515-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-in",
+        "@id": "urn:ex/room-301-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
+                "@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-539-reheat-coil-water-out",
+        "@id": "urn:ex/zone-113-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/vav-539-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-113-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-113-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-301-in",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumerationKind"
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-526-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-301"
+                "@id": "urn:ex/vav-526-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5631,356 +5698,371 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-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-505-pipe-hot-water-return-before-valve"
+                "@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-520-damper-out",
+        "@id": "urn:ex/vav-504-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-520-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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-520-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-520-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-108-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-202-occupancy",
+        "@id": "urn:ex/vav-529",
         "@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/office-ahu-ra-flow-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:ex/vav-529-air-in"
+            },
             {
-                "@id": "urn:ex/office-ahu-ra-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-529-air-out"
+            },
             {
-                "@id": "urn:ex/office-ahu-ra-flow"
+                "@id": "urn:ex/vav-529-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-hot-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-111-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-529-damper"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-air-in",
+        "@id": "urn:ex/vav-503-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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-air-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/connection-to-room-105"
+                "@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"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-504-discharge-air-flow"
+                "@id": "urn:ex/zone-312-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-504-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-312-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-504-discharge-air-temp"
+                "@id": "urn:ex/zone-312-occupancy"
             },
             {
-                "@id": "urn:ex/vav-504-discharge-air-temp-setpoint"
+                "@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/room-212",
+        "@id": "urn:ex/connection-to-room-118",
         "@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-212-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-in-connection",
+        "@id": "urn:ex/vav-533-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-538-duct-after-damper",
+        "@id": "urn:ex/vav-521-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-513-damper-out",
+        "@id": "urn:ex/room-205-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-513-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-205-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-205-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-513-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-513-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-heating-pid-output",
+        "@id": "urn:ex/vav-511-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/Dimensionless"
-            }
+            "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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-window-switch-on-off",
+        "@id": "urn:ex/vav-511-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-511-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-command",
-        "@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/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-511-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-cooling-pid-output",
+        "@id": "urn:ex/vav-534-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-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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-occupancy-override",
+        "@id": "urn:ex/vav-528-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-Override"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-discharge-air-temp-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-106-in",
+        "@id": "urn:ex/vav-538-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/connection-to-room-106-107"
+                "@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-Air"
+                "@id": "urn:ex/vav-538-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-538-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-temp",
+        "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve",
         "@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/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve",
+        "@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-514-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-215-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-514-air-in"
+                "@id": "urn:ex/room-215-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-514-discharge-air-flow"
+                "@id": "urn:ex/zone-215-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-532",
         "@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/vav-532-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-532-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-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-532-damper"
+            },
+            {
+                "@id": "urn:ex/vav-532-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-526-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -5992,18 +6074,7 @@
         ]
     },
     {
-        "@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-530-hot-water-out-connection",
+        "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -6015,7 +6086,7 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-301",
+        "@id": "urn:ex/vav-519-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -6027,67 +6098,47 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-101-occupancy",
+        "@id": "urn:ex/zone-309-310",
         "@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-Occupancy"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/room-309-hvac-domain"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-310-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/zone-309-310-cooling-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/zone-309-310-heating-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-535-hot-water-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-502-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/zone-309-310-occupancy"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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/zone-109-temp",
+        "@id": "urn:ex/zone-311-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6103,90 +6154,80 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-flow",
+        "@id": "urn:ex/vav-504-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-523-cooling-pid-output",
+        "@id": "urn:ex/room-204-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-connection-from-rooms"
             }
         ],
-        "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-530-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": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-202-in",
+        "@id": "urn:ex/vav-528-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/connection-to-room-202"
+                "@id": "urn:ex/vav-528-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-528-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-311-hvac-domain",
+        "@id": "urn:ex/room-112-hvac-domain",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-311-in"
+                "@id": "urn:ex/room-112-in"
             },
             {
-                "@id": "urn:ex/room-311-out"
+                "@id": "urn:ex/room-112-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -6196,129 +6237,152 @@
         ]
     },
     {
-        "@id": "urn:ex/room-211-hvac-domain",
+        "@id": "urn:ex/vav-537-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/room-211-in"
-            },
+                "@id": "urn:ex/vav-537-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/room-211-out"
+                "@id": "urn:ex/vav-537-damper-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-105-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://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve",
+        "@id": "urn:ex/vav-535-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-520-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-311"
             }
         ],
         "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-520-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-535-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-position"
+                "@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-534-hot-water-out",
+        "@id": "urn:ex/vav-531-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-534-hot-water-out-connection"
+                "@id": "urn:ex/vav-531-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-531-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-temp-sensor",
+        "@id": "urn:ex/vav-526-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/room-204-hvac-domain"
+                "@id": "urn:ex/connection-to-room-212"
             }
         ],
-        "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/vav-507-discharge-air-flow-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/VolumeFlowRate"
+                "@id": "urn:ex/vav-526-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-526-more-heat-requests"
             }
         ],
-        "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-526-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-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/vav-514-hot-water-out-connection"
+                "@id": "urn:ex/vav-514-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-113",
+        "@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-514-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-air-in",
+        "@id": "urn:ex/room-117-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-116-117"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -6328,231 +6392,218 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-105-cooling-setpoint",
+        "@id": "urn:ex/room-201-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-201"
             }
         ],
-        "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-540-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-313",
         "@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/Temperature"
+                "@id": "urn:ex/room-313-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-511-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-511-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/zone-313-cooling-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-command"
+                "@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-536-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-204-205-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-204-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-204-205-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-temp-sensor",
+        "@id": "urn:ex/vav-526-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-312-hvac-domain"
+                "@id": "urn:ex/vav-526-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/zone-312-temp"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-temp",
+        "@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/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-527-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-532-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-506-reheat-coil-air-out",
+        "@id": "urn:ex/room-105-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-106-107"
-            }
-        ],
-        "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-heating-pid-output"
+                "@id": "urn:ex/room-105-in"
             },
             {
-                "@id": "urn:ex/vav-506-more-heat-requests"
+                "@id": "urn:ex/room-105-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-506-air-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/zone-313-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/vav-518-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-531-discharge-air-temp",
         "@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#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-507-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/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-517-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-501-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve"
+                "@id": "urn:ex/vav-501-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-temp",
+        "@id": "urn:ex/vav-526-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/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-526-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-in",
+        "@id": "urn:ex/vav-502-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-101"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -6560,9 +6611,28 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-502-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-502-more-heat-requests"
+            }
+        ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-527-air-in"
+                "@id": "urn:ex/vav-502-air-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-102-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"
             }
         ]
     },
@@ -6586,7 +6656,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-525-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6602,49 +6672,69 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-damper",
+        "@id": "urn:ex/room-214-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-501-damper-in"
-            },
+                "@id": "urn:ex/connection-to-room-214"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-air-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-damper-command"
-            },
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-114-hvac-domain",
+        "@id": "urn:ex/vav-511-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-114-in"
-            },
+                "@id": "urn:ex/connection-to-room-112-114"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-114-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/vav-511-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-511-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-511-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-511-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-501-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6660,7 +6750,18 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-hot-water-out-connection",
+        "@id": "urn:ex/vav-509-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-522-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -6672,212 +6773,220 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-out",
+        "@id": "urn:ex/vav-505-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-515-hot-water-out-connection"
+                "@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/zone-105-occupancy-sensor",
+        "@id": "urn:ex/vav-508-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-105-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-506-hot-water-out-connection",
+        "@type": [
+            "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-105-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-water-in",
+        "@id": "urn:ex/vav-527-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-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-536-hot-water-in"
+                "@id": "urn:ex/vav-527-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-position",
+        "@id": "urn:ex/vav-525-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-211"
             }
         ],
-        "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-534",
-        "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-air-in"
+                "@id": "urn:ex/vav-525-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-534-air-out"
+                "@id": "urn:ex/vav-525-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-534-hot-water-in"
+                "@id": "urn:ex/vav-525-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-534-hot-water-out"
+                "@id": "urn:ex/vav-525-discharge-air-temp-setpoint"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-508-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-534-damper"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil"
-            },
+                "@id": "urn:ex/vav-508-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve"
+                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-519-damper-in",
         "@type": [
             "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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-519-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper",
+        "@id": "urn:ex/office-ahu-sa-temp-setpoint",
         "@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/vav-517-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-517-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-517-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-517-damper-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-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/vav-539-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-529-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-529-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-529-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-535-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/vav-517-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-517-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-hot-water-out",
+        "@id": "urn:ex/vav-505-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-539-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-505-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-505-damper-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-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-505-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-505-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-air-out",
+        "@id": "urn:ex/vav-535-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-305"
+                "@id": "urn:ex/connection-to-room-311"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -6887,160 +6996,183 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-533-discharge-air-flow"
+                "@id": "urn:ex/vav-535-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-533-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-535-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-533-discharge-air-temp"
+                "@id": "urn:ex/vav-535-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-533-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-535-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-flow",
+        "@id": "urn:ex/vav-535-damper-actuator",
         "@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#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-535-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/vav-535-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-205-hvac-domain",
+        "@id": "urn:ex/vav-518-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-205-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-205-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-513-reheat-coil-valve",
+        "@id": "urn:ex/vav-516-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "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-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-516-damper-in"
             },
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-516-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-516-damper-command"
             },
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-516-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-hot-water-in-connection",
+        "@id": "urn:ex/vav-524-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-524-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-538-discharge-air-flow-setpoint",
+        "@id": "urn:ex/room-106-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-106-in"
+            },
+            {
+                "@id": "urn:ex/room-106-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/zone-201",
+        "@id": "urn:ex/connection-to-room-111",
         "@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#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "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-523",
+        "@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-201-cooling-setpoint"
+                "@id": "urn:ex/vav-523-air-in"
             },
             {
-                "@id": "urn:ex/zone-201-heating-setpoint"
+                "@id": "urn:ex/vav-523-air-out"
             },
             {
-                "@id": "urn:ex/zone-201-occupancy"
+                "@id": "urn:ex/vav-523-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-201-occupancy-override"
+                "@id": "urn:ex/vav-523-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-523-damper"
             },
             {
-                "@id": "urn:ex/zone-201-temp"
+                "@id": "urn:ex/vav-523-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-201-window-switch-on-off"
+                "@id": "urn:ex/vav-523-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-hot-water-in",
+        "@id": "urn:ex/room-118",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-118-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@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-OnOff"
+            }
+        ]
+    },
+    {
+        "@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-540-hot-water-in-connection"
+                "@id": "urn:ex/vav-511-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7050,74 +7182,99 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve",
+        "@id": "urn:ex/room-314-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-502-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-502-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"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-102-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-502-reheat-coil-valve-command"
+                "@id": "urn:ex/room-102-in"
             },
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-position"
+                "@id": "urn:ex/room-102-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-position",
+        "@id": "urn:ex/connection-to-room-102",
         "@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/room-214",
+        "@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/PERCENT"
+                "@id": "urn:ex/room-214-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-flow",
+        "@id": "urn:ex/vav-503-cooling-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/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-506-damper-actuator",
+        "@type": [
+            "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-506-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-506-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-118-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -7131,13 +7288,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-hot-water-out",
+        "@id": "urn:ex/vav-536-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/vav-536-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-536-damper-command"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-516-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-hot-water-out-connection"
+                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7147,236 +7320,280 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-more-heat-requests",
+        "@id": "urn:ex/vav-511-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/vav-508-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-503-hot-water-in-connection",
         "@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/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@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/zone-118-occupancy-sensor",
+        "@id": "urn:ex/zone-108-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-118-hvac-domain"
+                "@id": "urn:ex/room-108-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-118-occupancy"
+                "@id": "urn:ex/zone-108-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-air-out",
+        "@id": "urn:ex/zone-101",
         "@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-101"
+                "@id": "urn:ex/room-101-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-502-discharge-air-flow"
+                "@id": "urn:ex/zone-101-building-static-pressure"
             },
             {
-                "@id": "urn:ex/vav-502-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-101-building-static-pressure-setpoint"
             },
             {
-                "@id": "urn:ex/vav-502-discharge-air-temp"
+                "@id": "urn:ex/zone-101-co2-concentration"
             },
             {
-                "@id": "urn:ex/vav-502-discharge-air-temp-setpoint"
+                "@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/room-311-out",
+        "@id": "urn:ex/vav-512-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/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/room-107-hvac-domain",
+        "@id": "urn:ex/vav-516-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-107-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-107-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/office-ahu-ra-flow",
+        "@id": "urn:ex/vav-516-hot-water-out",
         "@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#OutletConnectionPoint"
         ],
-        "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-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-213-temp-sensor",
+        "@id": "urn:ex/vav-520-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-213-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-213-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-516-damper-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-connection-to-vavs"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ea-out-connection",
-        "@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/vav-516-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-heating-pid-output",
+        "@id": "urn:ex/vav-530-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-502-hot-water-in-connection",
+        "@id": "urn:ex/vav-530-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-532",
+        "@id": "urn:ex/vav-508-damper-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-532-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-532-air-out"
-            },
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-532-hot-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-532-hot-water-out"
+                "@id": "urn:ex/vav-508-air-in"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-110-hvac-domain",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-damper"
+                "@id": "urn:ex/room-110-in"
             },
             {
-                "@id": "urn:ex/vav-532-reheat-coil"
-            },
+                "@id": "urn:ex/room-110-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-cooling-setpoint",
+        "@id": "urn:ex/zone-309-310-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -7392,26 +7609,22 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-colder-supply-air-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-540-discharge-air-temp",
+        "@id": "urn:ex/zone-106-107-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"
@@ -7424,13 +7637,13 @@
         ]
     },
     {
-        "@id": "urn:ex/room-306-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": [
@@ -7440,268 +7653,255 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-water-out",
+        "@id": "urn:ex/vav-533-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-505-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-533-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-504-reheat-coil-water-out",
+        "@id": "urn:ex/vav-517-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-504-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/zone-210-occupancy-sensor",
+        "@id": "urn:ex/room-108",
         "@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-108-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524",
+        "@id": "urn:ex/vav-513-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-524-air-in"
-            },
+                "@id": "urn:ex/connection-to-room-103"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-524-hot-water-in"
+                "@id": "urn:ex/vav-513-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-524-hot-water-out"
+                "@id": "urn:ex/vav-513-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-524-damper"
-            },
+                "@id": "urn:ex/vav-513-air-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-528-reheat-coil-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil"
-            },
+                "@id": "urn:ex/vav-528-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve"
+                "@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/vav-527-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-305-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-527-air-in"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-527-discharge-air-flow"
+                "@id": "urn:ex/zone-305-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-duct-after-damper",
+        "@id": "urn:ex/vav-513-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-513-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-539-colder-supply-air-requests",
+        "@id": "urn:ex/vav-534-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-534-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-534-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203",
+        "@id": "urn:ex/vav-527-reheat-coil-valve-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-203-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-527-pipe-hot-water-return-before-valve"
             }
         ],
-        "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#hasMedium": [
             {
-                "@id": "urn:ex/zone-203-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-occupancy-override",
+        "@id": "urn:ex/vav-513-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-Override"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-513-damper-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/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/office-ahu-htg-coil-valve-in",
+        "@id": "urn:ex/vav-528-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-pipe-hot-water-return-before-valve"
+                "@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/vav-517-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#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-528-heating-pid-output"
+            },
+            {
+                "@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-514-reheat-coil-valve",
+        "@id": "urn:ex/room-116-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-in"
+                "@id": "urn:ex/room-116-in"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/room-116-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-heating-pid-output",
+        "@id": "urn:ex/vav-518-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-537-reheat-coil-air-out",
+        "@id": "urn:ex/vav-525-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-312"
+                "@id": "urn:ex/vav-525-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7711,145 +7911,182 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-heating-pid-output"
+                "@id": "urn:ex/vav-525-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-537-more-heat-requests"
+                "@id": "urn:ex/vav-525-cooling-pid-output"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-504-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://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-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/zone-103-occupancy",
+        "@id": "urn:ex/vav-532-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-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-519-air-in",
+        "@id": "urn:ex/vav-520-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/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-528-hot-water-in-connection",
+        "@id": "urn:ex/vav-519-discharge-air-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/vav-519-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-519-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-309-310",
+        "@id": "urn:ex/zone-307-308-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/office-ahu-supply-duct-static-pressure-setpoint",
+        "@id": "urn:ex/vav-537-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/Pressure"
+                "@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://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-out",
+        "@id": "urn:ex/vav-521-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-530-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-521-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-521-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-530-colder-supply-air-requests"
+                "@id": "urn:ex/vav-521-damper-command"
             },
             {
-                "@id": "urn:ex/vav-530-cooling-pid-output"
+                "@id": "urn:ex/vav-521-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-hot-water-in-connection",
+        "@id": "urn:ex/vav-505-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-537-hot-water-out",
+        "@id": "urn:ex/vav-525-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/vav-537-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/office-ahu-htg-coil-valve-out",
+        "@id": "urn:ex/vav-530-reheat-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"
+                "@id": "urn:ex/vav-530-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7859,57 +8096,50 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-out"
+                "@id": "urn:ex/vav-530-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-temp",
+        "@id": "urn:ex/vav-536-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/zone-201-window-switch-on-off",
+        "@id": "urn:ex/office-ahu-clg-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/office-ahu-duct-after-htg-coil"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-501-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-538-reheat-coil-air-out",
+        "@id": "urn:ex/vav-529-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": [
@@ -7919,143 +8149,133 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-538-heating-pid-output"
+                "@id": "urn:ex/vav-529-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-538-more-heat-requests"
+                "@id": "urn:ex/vav-529-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-538-air-out"
+                "@id": "urn:ex/vav-529-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520",
+        "@id": "urn:ex/vav-532-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-520-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-520-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-520-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-520-damper"
-            },
-            {
-                "@id": "urn:ex/vav-520-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-flow",
+        "@id": "urn:ex/zone-214-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/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-ma-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/office-ahu-air-filter-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-ma-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-heating-setpoint",
+        "@id": "urn:ex/vav-522-colder-supply-air-requests",
         "@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-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-502-hot-water-out",
+        "@type": [
+            "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/vav-502-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-damper-position",
+        "@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/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-215-cooling-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/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-501-hot-water-out",
+        "@id": "urn:ex/vav-535-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-501-hot-water-out-connection"
+                "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8065,30 +8285,48 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-actuator",
+        "@id": "urn:ex/vav-528-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-503-damper"
+                "@id": "urn:ex/vav-528-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-503-damper-command"
+                "@id": "urn:ex/vav-528-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-212-occupancy",
         "@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-pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-103-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-521-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -8097,494 +8335,418 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-air-out",
+        "@id": "urn:ex/vav-507-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/office-ahu-sa-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-506-discharge-air-flow"
-            },
-            {
-                "@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/vav-535-discharge-air-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/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-107-in",
+        "@id": "urn:ex/zone-101-occupancy",
         "@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#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-damper-out",
+        "@id": "urn:ex/zone-101-building-static-pressure",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-519-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/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-519-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-519-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-115",
+        "@id": "urn:ex/vav-534-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-529-damper-actuator",
+        "@id": "urn:ex/vav-518-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/vav-529-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "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/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-water-in",
+        "@id": "urn:ex/vav-513-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-532-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-532-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-window-switch-on-off",
+        "@id": "urn:ex/vav-511-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-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-307-308-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "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/VolumeFlowRate"
             }
         ],
-        "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/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-503-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-111-temp-sensor",
+        "@id": "urn:ex/vav-528-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-111-hvac-domain"
+                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
             }
         ],
-        "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-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-air-out",
+        "@id": "urn:ex/vav-527-more-heat-requests",
         "@type": [
-            "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-Air"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "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-536-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-temp-setpoint"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper",
+        "@id": "urn:ex/room-215-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-527-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-damper-out"
+                "@id": "urn:ex/connection-to-room-215"
             }
         ],
-        "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#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-117-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-507-reheat-coil-valve",
+        "@id": "urn:ex/vav-516-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-507-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-516-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-hot-water-out",
+        "@id": "urn:ex/zone-301-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-512-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-537-cooling-pid-output",
+        "@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://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ],
-        "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"
+            }
+        ],
+        "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"
+            },
+            {
+                "@id": "urn:ex/zone-202-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-540-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-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-540-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-540-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-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/zone-106-107-temp-sensor",
+        "@id": "urn:ex/room-104-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-106-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-106-107-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-hot-water-out-connection",
+        "@id": "urn:ex/room-107",
         "@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-107-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-heating-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/room-214-in",
+        "@id": "urn:ex/vav-505-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-214"
+                "@id": "urn:ex/vav-505-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-505-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-heating-setpoint",
+        "@id": "urn:ex/vav-529-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-529-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-529-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212",
+        "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve",
         "@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-212-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-212-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-212-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-212-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-212-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-212-temp"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-212-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-occupancy-override",
+        "@id": "urn:ex/vav-516-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-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-temp",
+        "@id": "urn:ex/zone-103-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": [
             {
@@ -8598,7 +8760,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-hot-water-in-connection",
+        "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -8610,223 +8772,270 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-air-out",
+        "@id": "urn:ex/vav-507-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-215"
+                "@id": "urn:ex/vav-507-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-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-540-heating-pid-output"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-208-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-more-heat-requests"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-540-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-command",
+        "@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/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-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-115-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-509-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-522-air-in"
+                "@id": "urn:ex/vav-509-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-522-discharge-air-flow"
+                "@id": "urn:ex/vav-509-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil",
+        "@id": "urn:ex/vav-532-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "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-535-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-535-reheat-coil-air-out"
+                "@id": "urn:ex/vav-532-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-535-reheat-coil-water-in"
-            },
+                "@id": "urn:ex/vav-532-reheat-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil",
+        "@id": "urn:ex/zone-314",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "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-513-reheat-coil-air-in"
+                "@id": "urn:ex/room-314-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-314-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-513-reheat-coil-air-out"
+                "@id": "urn:ex/zone-314-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-513-reheat-coil-water-in"
+                "@id": "urn:ex/zone-314-occupancy"
             },
             {
-                "@id": "urn:ex/vav-513-reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/zone-314-occupancy-override"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/zone-314-temp"
+            },
+            {
+                "@id": "urn:ex/zone-314-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-cooling-setpoint",
+        "@id": "urn:ex/zone-206-co2-concentration",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "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/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-507-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve"
+                "@id": "urn:ex/vav-516-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-command",
+        "@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/DimensionlessRatio"
+                "@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/PERCENT"
+                "@id": "urn:ex/zone-211-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-occupancy",
+        "@id": "urn:ex/zone-113-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-535-hot-water-out-connection",
+        "@id": "urn:ex/zone-115-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/vav-510-discharge-air-flow-sensor",
+        "@id": "urn:ex/room-105-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-510-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-510-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-hot-water-out",
+        "@id": "urn:ex/vav-508-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-528-hot-water-out-connection"
+                "@id": "urn:ex/vav-508-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-508-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-214",
+        "@id": "urn:ex/connection-to-room-314",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -8838,29 +9047,39 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-air-in",
+        "@id": "urn:ex/vav-539-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-540-duct-after-damper"
+                "@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-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-in",
+        "@id": "urn:ex/room-207-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-oa-in-connection"
+                "@id": "urn:ex/connection-to-room-207"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8870,9 +9089,9 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-position",
+        "@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": [
             {
@@ -8886,90 +9105,142 @@
         ]
     },
     {
-        "@id": "urn:ex/room-309",
+        "@id": "urn:ex/office-ahu-ra-fan-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-309-hvac-domain"
+                "@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/office-ahu-ra-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-hot-water-in",
+        "@id": "urn:ex/vav-509-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-539-hot-water-in-connection"
+                "@id": "urn:ex/vav-509-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-509-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-509-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-509-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-521-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#cnx": [
+            {
+                "@id": "urn:ex/vav-521-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-521-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-window-switch-on-off",
+        "@id": "urn:ex/zone-202-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-OnOff"
+                "@id": "urn:ex/room-202-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-202-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil",
+        "@id": "urn:ex/vav-504-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-530-reheat-coil-air-in"
-            },
+                "@id": "urn:ex/vav-504-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-526-damper-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-water-in"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-112",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/room-112-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-duct-after-damper",
+        "@id": "urn:ex/vav-518-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/vav-518-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-518-damper-command"
             }
         ]
     },
@@ -8985,51 +9256,73 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-503-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-503-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-503-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil",
+        "@id": "urn:ex/vav-531-colder-supply-air-requests",
         "@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-503-reheat-coil-air-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-501-discharge-air-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-water-in"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-reheat-coil-valve-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-512-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-temp",
+        "@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": [
             {
@@ -9043,71 +9336,67 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-115-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-511",
+        "@id": "urn:ex/vav-509-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-511-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-511-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-511-hot-water-in"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-511-hot-water-out"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-511-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-occupancy-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-214-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-214-occupancy"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-311",
+        "@id": "urn:ex/office-ahu-connection-to-vavs",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -9119,59 +9408,62 @@
         ]
     },
     {
-        "@id": "urn:ex/room-215-hvac-domain",
+        "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve",
         "@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#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/zone-301-occupancy",
+        "@id": "urn:ex/zone-111",
         "@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-Occupancy"
+                "@id": "urn:ex/room-111-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-301-temp",
-        "@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/Temperature"
+                "@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/DEG_C"
+                "@id": "urn:ex/zone-111-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-111-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-111-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-111-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-111-temp"
+            },
+            {
+                "@id": "urn:ex/zone-111-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-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-110"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -9181,26 +9473,26 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-507-heating-pid-output"
+                "@id": "urn:ex/vav-530-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-507-more-heat-requests"
+                "@id": "urn:ex/vav-530-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-507-air-out"
+                "@id": "urn:ex/vav-530-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-air-in",
+        "@id": "urn:ex/vav-509-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-509-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -9210,189 +9502,232 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-moisture-eliminator-in",
+        "@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-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-oa-in-connection"
+                "@id": "urn:ex/vav-532-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-oa-in"
+                "@id": "urn:ex/vav-532-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-duct-after-damper",
+        "@id": "urn:ex/vav-527-discharge-air-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/vav-527-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-527-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-air-out",
+        "@id": "urn:ex/vav-522-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-211"
+                "@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-525-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-525-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-525-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-525-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-hot-water-out",
+        "@id": "urn:ex/vav-523-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-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-518-hot-water-in",
+        "@id": "urn:ex/vav-507-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-518-hot-water-in-connection"
+                "@id": "urn:ex/vav-507-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-507-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-actuator",
+        "@id": "urn:ex/zone-109-occupancy-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-damper"
+                "@id": "urn:ex/room-109-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-518-damper-command"
+                "@id": "urn:ex/zone-109-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-actuator",
+        "@id": "urn:ex/room-303",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-303-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-511-damper"
+                "@id": "urn:ex/vav-524-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-511-damper-command"
+                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-command",
+        "@id": "urn:ex/vav-531-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-531-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-506-colder-supply-air-requests",
+        "@id": "urn:ex/room-203-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/connection-to-room-203"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-hot-water-in-connection",
+        "@id": "urn:ex/vav-535-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-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-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-111-in",
+        "@id": "urn:ex/vav-532-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/connection-to-room-111"
+                "@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-528-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -9404,181 +9739,162 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-in",
+        "@id": "urn:ex/vav-518-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/office-ahu-connection-to-vavs"
+                "@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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-514-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-air-out",
+        "@id": "urn:ex/vav-506-cooling-pid-output",
         "@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#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://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@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"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-522-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-313-in",
+        "@id": "urn:ex/vav-536-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"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-536-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-in",
+        "@id": "urn:ex/vav-514-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/vav-514-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-damper",
+        "@id": "urn:ex/vav-502-damper-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-540-damper-in"
-            },
+                "@id": "urn:ex/vav-502-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-540-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-540-damper-command"
+                "@id": "urn:ex/vav-502-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-540-damper-position"
+                "@id": "urn:ex/vav-502-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-more-heat-requests",
+        "@id": "urn:ex/office-ahu-air-filter-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-duct-after-oa-ra-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/office-ahu-ma-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve",
+        "@id": "urn:ex/vav-526-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-510-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper",
+        "@id": "urn:ex/room-108-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-520-damper-in"
+                "@id": "urn:ex/room-108-in"
             },
             {
-                "@id": "urn:ex/vav-520-damper-out"
+                "@id": "urn:ex/room-108-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-520-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-520-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-out",
+        "@id": "urn:ex/vav-519-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-duct-after-damper"
+                "@id": "urn:ex/vav-519-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -9588,104 +9904,118 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-528-colder-supply-air-requests"
+                "@id": "urn:ex/vav-519-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-528-cooling-pid-output"
+                "@id": "urn:ex/vav-519-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-occupancy-sensor",
+        "@id": "urn:ex/vav-513-damper-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-312-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-312-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-513-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-air-out",
+        "@id": "urn:ex/vav-519-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-115"
+                "@id": "urn:ex/vav-519-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-519-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-519-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-519-damper-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-313-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-514-heating-pid-output"
+                "@id": "urn:ex/room-313-in"
             },
             {
-                "@id": "urn:ex/vav-514-more-heat-requests"
+                "@id": "urn:ex/room-313-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-514-air-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-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-515-duct-after-damper"
+                "@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-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-515-colder-supply-air-requests"
+                "@id": "urn:ex/zone-115-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-515-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-508-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/zone-115-heating-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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/vav-507-discharge-air-temp",
+        "@id": "urn:ex/zone-116-117-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"
@@ -9698,110 +10028,96 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-in-connection",
+        "@id": "urn:ex/room-109-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-524-reheat-coil",
+        "@id": "urn:ex/vav-502-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-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-502-damper-in"
             },
             {
-                "@id": "urn:ex/vav-524-reheat-coil-water-out"
+                "@id": "urn:ex/vav-502-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-502-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-502-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-water-in",
+        "@id": "urn:ex/room-108-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-508-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-command",
+        "@id": "urn:ex/vav-538-colder-supply-air-requests",
         "@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-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-actuator",
+        "@id": "urn:ex/zone-311-occupancy",
         "@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-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-212",
+        "@id": "urn:ex/vav-515-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/connection-to-room-211",
+        "@id": "urn:ex/office-ahu-oa-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -9813,26 +10129,25 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-out-connection",
+        "@id": "urn:ex/zone-118-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-118-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-118-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-flow",
+        "@id": "urn:ex/vav-521-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": [
             {
@@ -9846,10 +10161,26 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-temp-setpoint",
+        "@id": "urn:ex/office-ahu-ra-fan-speed-cmd",
         "@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/zone-203-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -9862,55 +10193,81 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-water-out",
+        "@id": "urn:ex/vav-513-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-520-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-513-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-513-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-539-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-539-air-in"
+                "@id": "urn:ex/vav-539-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-discharge-air-flow"
+                "@id": "urn:ex/vav-539-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-210",
         "@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-210-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-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"
+            },
+            {
+                "@id": "urn:ex/zone-210-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-hot-water-in-connection",
+        "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -9922,46 +10279,42 @@
         ]
     },
     {
-        "@id": "urn:ex/room-107-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/office-ahu-connection-from-rooms"
+                "@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/vav-503-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-513-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-503-air-in"
+                "@id": "urn:ex/vav-513-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-503-discharge-air-flow"
+                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-air-in",
+        "@id": "urn:ex/vav-537-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-517-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9970,209 +10323,158 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-out",
+        "@id": "urn:ex/vav-520-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-523-duct-after-damper"
+                "@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"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-523-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-523-cooling-pid-output"
+                "@id": "urn:ex/vav-520-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper",
+        "@id": "urn:ex/vav-516-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-507-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-507-damper-out"
+                "@id": "urn:ex/vav-516-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-507-damper-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-507-damper-position"
+                "@id": "urn:ex/vav-516-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-cooling-pid-output",
+        "@id": "urn:ex/vav-512-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-524-reheat-coil-water-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-524-hot-water-in-connection"
+                "@id": "urn:ex/vav-540-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/zone-104-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-204-205-window-switch-on-off",
+        "@id": "urn:ex/office-ahu-ra-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-OnOff"
+                "@id": "urn:ex/office-ahu-ra-damper"
             }
-        ]
-    },
-    {
-        "@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": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/office-ahu-ra-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-101-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-101"
             }
         ],
-        "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-508-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-106-107-occupancy-override",
         "@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-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve",
+        "@id": "urn:ex/vav-521-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-515-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-521-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@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": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-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/vav-534-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"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-208-209-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-534-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-534-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-occupancy-override",
+        "@id": "urn:ex/zone-313-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -10183,9 +10485,9 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-temp",
+        "@id": "urn:ex/zone-207-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -10199,68 +10501,73 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-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-509-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-537-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-537-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-509-colder-supply-air-requests"
+                "@id": "urn:ex/vav-537-damper-command"
             },
             {
-                "@id": "urn:ex/vav-509-cooling-pid-output"
+                "@id": "urn:ex/vav-537-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-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-112-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-112-114-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-in",
+        "@id": "urn:ex/vav-511-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/office-ahu-connection-to-vavs"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-discharge-air-temp-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/vav-537-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-503-air-in"
+                "@id": "urn:ex/vav-537-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-in",
+        "@id": "urn:ex/vav-527-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -10273,49 +10580,45 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-508-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-actuator",
+        "@id": "urn:ex/vav-530-reheat-coil-water-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-507-damper"
+                "@id": "urn:ex/vav-530-hot-water-in-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-530-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-actuator",
+        "@id": "urn:ex/connection-to-room-303-304-306",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-539-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-539-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-heating-setpoint",
+        "@id": "urn:ex/zone-111-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -10329,50 +10632,35 @@
         ]
     },
     {
-        "@id": "urn:ex/room-310",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:ex/room-310-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-109-heating-setpoint",
+        "@id": "urn:ex/vav-534-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/room-116-out",
+        "@id": "urn:ex/vav-517-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/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-517-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-heating-pid-output",
+        "@id": "urn:ex/vav-513-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -10388,90 +10676,110 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-water-out",
+        "@id": "urn:ex/vav-510-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-519-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-509-discharge-air-flow-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-509-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-509-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-536-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-536-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-536-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-flow",
+        "@id": "urn:ex/zone-102",
         "@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-102-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-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/vav-539-hot-water-in-connection",
+        "@id": "urn:ex/room-303-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-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-537-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-510-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -10485,45 +10793,56 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-air-in",
+        "@id": "urn:ex/zone-206",
         "@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-525-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-cooling-pid-output",
-        "@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/Dimensionless"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-206-co2-concentration"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@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-501-reheat-coil-air-out",
+        "@id": "urn:ex/vav-515-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-102"
+                "@id": "urn:ex/connection-to-room-116-117"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10533,250 +10852,229 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-501-heating-pid-output"
+                "@id": "urn:ex/vav-515-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-501-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-515-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-501-air-out"
+                "@id": "urn:ex/vav-515-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-515-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-506-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-503-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-505-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-313-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-101-out",
+        "@id": "urn:ex/vav-502-colder-supply-air-requests",
         "@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#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-509-reheat-coil-valve",
+        "@id": "urn:ex/zone-212-heating-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-540-discharge-air-flow",
+        "@id": "urn:ex/zone-208-209-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": [
             {
-                "@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-510-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-206-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-510-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-heating-pid-output",
+        "@id": "urn:ex/room-309",
         "@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/Dimensionless"
+                "@id": "urn:ex/room-309-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-hot-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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-301-hvac-domain",
+        "@id": "urn:ex/vav-510-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-301-in"
-            },
+                "@id": "urn:ex/vav-510-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-301-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/vav-510-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-510-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-516-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-512-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-512-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-cooling-setpoint",
+        "@id": "urn:ex/office-ahu-duct-after-oa-ra-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-526-damper",
+        "@id": "urn:ex/vav-532-reheat-coil-air-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-526-damper-in"
-            },
+                "@id": "urn:ex/connection-to-room-309-310"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-526-damper-command"
+                "@id": "urn:ex/vav-532-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-526-damper-position"
+                "@id": "urn:ex/vav-532-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-532-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-heating-setpoint",
+        "@id": "urn:ex/vav-502-more-heat-requests",
         "@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-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-110-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/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-out",
+        "@id": "urn:ex/room-204-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/connection-to-room-204-205"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10786,433 +11084,478 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-115-occupancy-sensor",
+        "@id": "urn:ex/vav-504-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-115-hvac-domain"
+                "@id": "urn:ex/vav-504-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/zone-115-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-526-discharge-air-temp-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-503-damper",
+        "@id": "urn:ex/zone-106-107-occupancy-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-503-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-503-damper-out"
+                "@id": "urn:ex/room-106-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-503-damper-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-503-damper-position"
+                "@id": "urn:ex/zone-106-107-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-302",
+        "@id": "urn:ex/vav-523-reheat-coil-air-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-302-hvac-domain"
+                "@id": "urn:ex/connection-to-room-206"
             }
-        ]
-    },
-    {
-        "@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#cnx": [
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-air-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-water-in"
+                "@id": "urn:ex/vav-523-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-523-reheat-coil-water-out"
+                "@id": "urn:ex/vav-523-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-523-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-out-connection",
+        "@id": "urn:ex/vav-506-discharge-air-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://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-517-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-517-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "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/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-out",
+        "@id": "urn:ex/vav-521-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-538-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/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-538-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-538-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-203",
+        "@id": "urn:ex/zone-116-117-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-203-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-occupancy",
+        "@id": "urn:ex/zone-215-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-Occupancy"
+                "@id": "urn:ex/room-215-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-215-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115",
+        "@id": "urn:ex/room-309-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-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/vav-533",
+        "@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-115-cooling-setpoint"
+                "@id": "urn:ex/vav-533-air-in"
             },
             {
-                "@id": "urn:ex/zone-115-heating-setpoint"
+                "@id": "urn:ex/vav-533-air-out"
             },
             {
-                "@id": "urn:ex/zone-115-occupancy"
+                "@id": "urn:ex/vav-533-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-115-occupancy-override"
+                "@id": "urn:ex/vav-533-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-533-damper"
             },
             {
-                "@id": "urn:ex/zone-115-temp"
+                "@id": "urn:ex/vav-533-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-115-window-switch-on-off"
+                "@id": "urn:ex/vav-533-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-538-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-538-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-538-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-212-out",
+        "@id": "urn:ex/vav-519-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-520-reheat-coil",
+        "@id": "urn:ex/vav-501-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-520-reheat-coil-air-in"
-            },
+                "@id": "urn:ex/connection-to-room-102"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil-air-out"
+                "@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-520-reheat-coil-water-in"
+                "@id": "urn:ex/vav-501-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-520-reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/vav-501-discharge-air-temp"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-501-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-air-in",
+        "@id": "urn:ex/vav-525-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-521-duct-after-damper"
+                "@id": "urn:ex/vav-525-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-525-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-air-out",
+        "@id": "urn:ex/vav-516-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/connection-to-room-211"
+                "@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#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-heating-pid-output"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-525-more-heat-requests"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-518-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-525-air-out"
+                "@id": "urn:ex/vav-518-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-518-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-temp",
+        "@id": "urn:ex/vav-506-more-heat-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/Temperature"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-518-reheat-coil-air-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-518-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-window-switch-on-off",
+        "@id": "urn:ex/vav-524-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-OnOff"
+                "@id": "urn:ex/vav-524-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-524-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516",
+        "@id": "urn:ex/vav-517",
         "@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-516-air-in"
+                "@id": "urn:ex/vav-517-air-in"
             },
             {
-                "@id": "urn:ex/vav-516-air-out"
+                "@id": "urn:ex/vav-517-air-out"
             },
             {
-                "@id": "urn:ex/vav-516-hot-water-in"
+                "@id": "urn:ex/vav-517-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-516-hot-water-out"
+                "@id": "urn:ex/vav-517-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-516-damper"
+                "@id": "urn:ex/vav-517-damper"
             },
             {
-                "@id": "urn:ex/vav-516-reheat-coil"
+                "@id": "urn:ex/vav-517-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-516-reheat-coil-valve"
+                "@id": "urn:ex/vav-517-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-duct-after-damper",
+        "@id": "urn:ex/zone-113-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/zone-208-209-occupancy-sensor",
+        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-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-208-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-208-209-occupancy"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-210",
+        "@id": "urn:ex/vav-536",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-210-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#contains": [
+            {
+                "@id": "urn:ex/vav-536-damper"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115-out",
+        "@id": "urn:ex/vav-526-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/office-ahu-connection-from-rooms"
+                "@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/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-504-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"
@@ -11224,56 +11567,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-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-522-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-522-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-522-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-522-reheat-coil-valve-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-536-discharge-air-flow",
+        "@id": "urn:ex/vav-512-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-529-cooling-pid-output",
+        "@id": "urn:ex/vav-506-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11289,91 +11599,85 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-colder-supply-air-requests",
+        "@id": "urn:ex/connection-to-room-109",
         "@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/room-209-in",
+        "@id": "urn:ex/vav-538-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/connection-to-room-208-209"
+                "@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/vav-538-air-out",
+        "@id": "urn:ex/zone-106-107-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-213"
-            }
+            "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-538-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-538-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-538-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-in",
+        "@id": "urn:ex/zone-212-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-connection-to-vavs"
+                "@id": "urn:ex/room-212-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-212-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve",
+        "@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-517-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-air-in",
+        "@id": "urn:ex/room-305-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/connection-to-room-305"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -11383,37 +11687,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-air-out",
+        "@id": "urn:ex/vav-509-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-203"
-            }
+            "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-509-air-out"
             }
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-517-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-509-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-temp",
+        "@id": "urn:ex/vav-508-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11424,70 +11714,28 @@
         ],
         "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/vav-520-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-522-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
-            {
-                "@id": "urn:ex/vav-522-damper-command"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-temp",
+        "@id": "urn:ex/vav-519-colder-supply-air-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/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-538-damper-position",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11503,145 +11751,119 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-111-cooling-setpoint",
+        "@id": "urn:ex/vav-525-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-525-reheat-coil-air-in"
+            },
+            {
+                "@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://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-538-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-208-209-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-538-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-538-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-air-out",
+        "@id": "urn:ex/vav-501-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/connection-to-room-103"
-            }
-        ],
-        "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-discharge-air-flow"
+                "@id": "urn:ex/vav-501-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-513-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-501-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-513-discharge-air-temp"
+                "@id": "urn:ex/vav-501-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-513-discharge-air-temp-setpoint"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-oa-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-501-reheat-coil-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-303-304-306-occupancy-override",
-        "@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-Override"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-water-in",
+        "@id": "urn:ex/vav-533-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-510-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-533-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-510-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-water-in",
+        "@id": "urn:ex/vav-527-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-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-507-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-109",
+        "@id": "urn:ex/zone-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-109-hvac-domain"
+                "@id": "urn:ex/room-108-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -11651,80 +11873,64 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-109-cooling-setpoint"
+                "@id": "urn:ex/zone-108-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-109-heating-setpoint"
+                "@id": "urn:ex/zone-108-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-109-occupancy"
+                "@id": "urn:ex/zone-108-occupancy"
             },
             {
-                "@id": "urn:ex/zone-109-occupancy-override"
+                "@id": "urn:ex/zone-108-occupancy-override"
             },
             {
-                "@id": "urn:ex/zone-109-temp"
+                "@id": "urn:ex/zone-108-temp"
             },
             {
-                "@id": "urn:ex/zone-109-window-switch-on-off"
+                "@id": "urn:ex/zone-108-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-504-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve"
+                "@id": "urn:ex/vav-504-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ra-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-504-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-flow",
+        "@id": "urn:ex/vav-533-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-533-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-533-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve",
+        "@id": "urn:ex/vav-525-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -11736,235 +11942,228 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-out",
+        "@id": "urn:ex/room-306-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-513-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-306-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-306-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-513-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-303-304-306-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-535-reheat-coil-valve-in",
+        "@id": "urn:ex/connection-to-room-215",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-535-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/zone-202-heating-setpoint",
+        "@id": "urn:ex/vav-502-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-528-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-521-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-521-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-504-reheat-coil-water-in",
+        "@id": "urn:ex/room-102-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/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-504-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-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#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-105",
+        "@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-Water"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-204",
+        "@id": "urn:ex/room-210",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-204-hvac-domain"
+                "@id": "urn:ex/room-210-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304-in",
+        "@id": "urn:ex/vav-509-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-303-304-306"
+                "@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-530-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-112-114-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-530-air-in"
+                "@id": "urn:ex/room-112-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-530-discharge-air-flow"
+                "@id": "urn:ex/zone-112-114-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-heating-setpoint",
+        "@id": "urn:ex/room-215",
         "@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-215-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-air-in",
+        "@id": "urn:ex/zone-303-304-306",
         "@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-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-114-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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/zone-303-304-306-cooling-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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/office-ahu-chilled-water-in-connection",
+        "@id": "urn:ex/vav-504-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-504-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@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#hasMedium": [
             {
@@ -11973,94 +12172,127 @@
         ]
     },
     {
-        "@id": "urn:ex/room-102-out",
+        "@id": "urn:ex/vav-524-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-connection-from-rooms"
+                "@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://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/vav-526-damper-position",
+        "@id": "urn:ex/vav-501-more-heat-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/zone-118-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-533-reheat-coil-air-in",
+        "@id": "urn:ex/vav-505-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-533-duct-after-damper"
+                "@id": "urn:ex/vav-505-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-hot-water-out",
+        "@id": "urn:ex/office-ahu-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/vav-533-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-sa-fan-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-sa-fan-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-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"
+            },
+            {
+                "@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/office-ahu-clg-coil-valve-actuator",
+        "@id": "urn:ex/zone-210-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/room-117-in",
+        "@id": "urn:ex/vav-540-duct-after-damper",
         "@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#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -12069,7 +12301,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-temp",
+        "@id": "urn:ex/vav-502-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -12080,267 +12312,272 @@
         ],
         "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-208-209-heating-setpoint",
+        "@id": "urn:ex/vav-502-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-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-from-rooms"
-            }
-        ],
-        "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-502-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
+                "@id": "urn:ex/vav-506-air-out"
+            },
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve"
+                "@id": "urn:ex/vav-506-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-506-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-506-damper"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-heating-pid-output",
+        "@id": "urn:ex/zone-303-304-306-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/vav-511-damper-out",
+        "@id": "urn:ex/vav-515-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-511-duct-after-damper"
+                "@id": "urn:ex/vav-515-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-110-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-511-colder-supply-air-requests"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-511-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "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-529-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-518-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-540-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-518-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-518-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-540-hot-water-out"
+                "@id": "urn:ex/vav-518-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-518-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-chilled-water-out",
+        "@id": "urn:ex/vav-527-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-chilled-water-out-connection"
+                "@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/zone-211",
+        "@id": "urn:ex/room-212-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-211-hvac-domain"
+                "@id": "urn:ex/room-212-in"
+            },
+            {
+                "@id": "urn:ex/room-212-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-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"
-            },
-            {
-                "@id": "urn:ex/zone-211-window-switch-on-off"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-co2-concentration",
+        "@id": "urn:ex/vav-540-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@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://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-occupancy-override",
+        "@id": "urn:ex/vav-523-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/room-204-in",
+        "@id": "urn:ex/vav-506-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-204-205"
+                "@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-512-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": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-506-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-out"
+                "@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/vav-536-discharge-air-flow-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#Water-HotWater"
+                "@id": "urn:ex/vav-536-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-536-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-cooling-pid-output",
+        "@id": "urn:ex/vav-523-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -12356,174 +12593,135 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-water-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-503-hot-water-in-connection"
+                "@id": "urn:ex/vav-502-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-503-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-511-discharge-air-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/vav-511-air-in"
             }
-        ]
-    },
-    {
-        "@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#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-511-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-cooling-pid-output",
+        "@id": "urn:ex/zone-115-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-506-damper-actuator",
+        "@id": "urn:ex/vav-509-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-506-damper"
+                "@id": "urn:ex/vav-509-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-506-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-actuator",
+        "@id": "urn:ex/vav-506-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-ra-damper"
+                "@id": "urn:ex/vav-506-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/office-ahu-ra-damper-command"
-            }
-        ]
-    },
-    {
-        "@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": "urn:ex/vav-506-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-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/vav-521-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-521-hot-water-out"
+                "@id": "urn:ex/vav-511-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil",
+        "@id": "urn:ex/zone-302-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-521-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-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-513-cooling-pid-output",
+        "@id": "urn:ex/vav-534-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-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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-more-heat-requests",
+        "@id": "urn:ex/vav-520-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -12534,23 +12732,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-502-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-531-air-out"
+                "@id": "urn:ex/vav-502-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-531-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-flow",
+        "@id": "urn:ex/vav-521-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -12561,77 +12759,76 @@
         ],
         "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-cooling-pid-output",
+        "@id": "urn:ex/vav-521-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@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/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil",
+        "@id": "urn:ex/vav-505-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-515-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-water-out"
+                "@id": "urn:ex/vav-505-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-505-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-hot-water-in-connection",
+        "@id": "urn:ex/zone-104-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/vav-514-hot-water-out",
+        "@id": "urn:ex/vav-519-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-514-hot-water-out-connection"
+                "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12641,56 +12838,63 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-524-duct-after-damper",
+        "@id": "urn:ex/vav-539-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-damper-in",
+        "@id": "urn:ex/office-ahu-moisture-eliminator-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-moisture-eliminator"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-532-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-temp-sensor",
+        "@id": "urn:ex/vav-504-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-302-hvac-domain"
+                "@id": "urn:ex/vav-504-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-302-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-heating-setpoint",
+        "@id": "urn:ex/vav-531-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-115-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -12706,154 +12910,129 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-heating-pid-output",
+        "@id": "urn:ex/zone-112-114-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-112-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-112-114-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-air-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-538-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": "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-535-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-535-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-511-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-307-308",
+        "@id": "urn:ex/vav-527-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-519-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-101-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/room-101-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-101-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108",
+        "@id": "urn:ex/room-103-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-108-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/office-ahu-connection-from-rooms"
             }
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-108-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-108-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/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-531-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-531-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-531-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-531-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-air-in",
+        "@id": "urn:ex/vav-530-hot-water-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-530-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-damper-position",
+        "@id": "urn:ex/office-ahu-htg-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -12867,52 +13046,55 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-air-out",
+        "@id": "urn:ex/vav-534-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-116-117"
+                "@id": "urn:ex/vav-534-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-534-discharge-air-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-damper-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-515-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-515-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-515-air-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-temp-sensor",
+        "@id": "urn:ex/vav-523-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-314-hvac-domain"
+                "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-314-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-colder-supply-air-requests",
+        "@id": "urn:ex/office-ahu-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -12923,149 +13105,115 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-202",
-        "@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#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
-        ],
-        "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"
-            },
-            {
-                "@id": "urn:ex/zone-202-window-switch-on-off"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-533-damper-actuator",
+        "@id": "urn:ex/connection-to-room-214",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-533-damper"
-            }
+            "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-533-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-539-duct-after-damper",
         "@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#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/connection-to-room-201",
+        "@id": "urn:ex/vav-524-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-505-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-301-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-505-air-out"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-505-discharge-air-temp"
+                "@id": "urn:ex/zone-301-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve",
+        "@id": "urn:ex/vav-540-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-532-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-215"
             }
         ],
         "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-532-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-540-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-540-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-540-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-occupancy-override",
+        "@id": "urn:ex/vav-504-discharge-air-temp",
         "@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-Override"
+                "@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-529-damper-out",
+        "@id": "urn:ex/vav-525-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-529-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13073,218 +13221,186 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-529-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-529-cooling-pid-output"
+                "@id": "urn:ex/vav-525-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil",
+        "@id": "urn:ex/vav-530-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-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-530-damper-in"
             },
             {
-                "@id": "urn:ex/vav-526-reheat-coil-water-out"
+                "@id": "urn:ex/vav-530-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-530-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-530-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-position",
+        "@id": "urn:ex/vav-537-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-510-reheat-coil-air-out",
+        "@id": "urn:ex/office-ahu-clg-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-111"
+                "@id": "urn:ex/office-ahu-chilled-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-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/office-ahu-chilled-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-air-out",
+        "@id": "urn:ex/vav-532-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-305"
-            }
+            "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-532-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-533-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-533-more-heat-requests"
+                "@id": "urn:ex/vav-532-discharge-air-flow"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve",
+        "@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-533-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil",
+        "@id": "urn:ex/office-ahu-clg-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterCoil"
+            "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-air-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-air-out"
+                "@id": "urn:ex/office-ahu-clg-coil-valve-in"
             },
             {
-                "@id": "urn:ex/office-ahu-clg-coil-water-in"
-            },
+                "@id": "urn:ex/office-ahu-clg-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-215-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/zone-211-temp-sensor",
+        "@id": "urn:ex/room-311-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-211-hvac-domain"
+                "@id": "urn:ex/room-311-in"
+            },
+            {
+                "@id": "urn:ex/room-311-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-211-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-command",
+        "@id": "urn:ex/vav-533-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": [
             {
-                "@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/vav-510-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-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": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-in-connection",
+        "@id": "urn:ex/vav-519-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -13296,53 +13412,36 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper",
+        "@id": "urn:ex/zone-213-window-switch-on-off",
         "@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-509-damper-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-509-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-509-damper-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-heating-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/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",
+        "@id": "urn:ex/vav-514-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": [
             {
@@ -13356,388 +13455,401 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-out",
+        "@id": "urn:ex/room-308-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-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/room-308-in"
             },
             {
-                "@id": "urn:ex/vav-504-cooling-pid-output"
+                "@id": "urn:ex/room-308-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-515-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/office-ahu-clg-coil-air-out",
+        "@id": "urn:ex/vav-535-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-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/zone-203-heating-setpoint",
+        "@id": "urn:ex/vav-506-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-510-duct-after-damper",
+        "@id": "urn:ex/vav-534-discharge-air-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/vav-534-air-in"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-521-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#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-534-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-528-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-536-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/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-536-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-110",
         "@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-502-pipe-hot-water-return-before-valve"
+                "@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-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "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"
+            },
+            {
+                "@id": "urn:ex/zone-110-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-actuator",
+        "@id": "urn:ex/vav-507-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-532-damper"
+                "@id": "urn:ex/vav-507-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-532-damper-command"
+                "@id": "urn:ex/vav-507-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110-hvac-domain",
+        "@id": "urn:ex/vav-531-reheat-coil-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-110-in"
-            },
-            {
-                "@id": "urn:ex/room-110-out"
+                "@id": "urn:ex/vav-531-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/office-ahu-ra-fan-start-status",
+        "@id": "urn:ex/vav-520-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-OnOff"
+                "@id": "urn:ex/vav-520-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-520-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-temp",
+        "@id": "urn:ex/vav-532-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-505-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-101-occupancy-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-101-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-101-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-hot-water-out",
+        "@id": "urn:ex/room-211-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-hot-water-out-connection"
+                "@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/vav-515-discharge-air-flow",
+        "@id": "urn:ex/vav-508-damper-actuator",
         "@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#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-508-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/vav-508-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115",
+        "@id": "urn:ex/vav-510-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-115-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-out-connection",
+        "@id": "urn:ex/room-205",
         "@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-205-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-actuator",
+        "@id": "urn:ex/room-205-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-reheat-coil-valve"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-cooling-pid-output",
+        "@id": "urn:ex/office-ahu-ea-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/office-ahu-ea-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-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/office-ahu-ea-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-heating-setpoint",
+        "@id": "urn:ex/vav-512-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/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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-512-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve",
+        "@id": "urn:ex/vav-502",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterValve"
+            "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-clg-coil-valve-in"
+                "@id": "urn:ex/vav-502-air-in"
             },
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-502-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "urn:ex/vav-502-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
+                "@id": "urn:ex/vav-502-damper"
             },
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-position"
+                "@id": "urn:ex/vav-502-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-actuator",
+        "@id": "urn:ex/vav-519-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-527-damper"
+                "@id": "urn:ex/vav-519-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-527-damper-command"
+                "@id": "urn:ex/vav-519-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-525-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-525-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-525-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-525-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-525-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-air-in",
+        "@id": "urn:ex/zone-202-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-506-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-501-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13746,97 +13858,78 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-in",
+        "@id": "urn:ex/vav-536-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/office-ahu-duct-after-ra-fan"
+                "@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-513-damper-actuator",
+        "@id": "urn:ex/room-107-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-513-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-513-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-building-static-pressure-setpoint",
+        "@id": "urn:ex/zone-208-209-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/Pressure"
+                "@id": "urn:ex/room-208-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:ex/zone-208-209-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-out",
+        "@id": "urn:ex/room-114-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-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/office-ahu-sa-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil",
+        "@id": "urn:ex/office-ahu-ea-out-connection",
         "@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#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "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"
             }
         ]
     },
@@ -13857,265 +13950,233 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-206-temp",
+        "@id": "urn:ex/vav-536-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/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-clg-coil-water-in",
+        "@id": "urn:ex/room-301",
         "@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#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/office-ahu-colder-chilled-water-requests"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-517-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/office-ahu-chilled-water-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-command",
+        "@id": "urn:ex/zone-313-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-518-air-in",
+        "@id": "urn:ex/vav-538-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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-temp-sensor",
+        "@id": "urn:ex/vav-514-discharge-air-temp-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-514-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-118-temp"
+                "@id": "urn:ex/vav-514-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302",
+        "@id": "urn:ex/room-116",
         "@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-302-hvac-domain"
+                "@id": "urn:ex/room-116-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-201-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-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://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-302-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-112-114-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-539-damper-actuator",
+        "@id": "urn:ex/vav-522-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-539-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-539-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-514-reheat-coil-air-in",
+        "@id": "urn:ex/vav-502-reheat-coil-water-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/vav-502-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-533-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#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-502-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-208-209-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-537-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-537-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-in",
+        "@id": "urn:ex/vav-519-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-532-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/zone-105-temp",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-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": "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": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-513-reheat-coil-valve-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/vav-513-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14125,152 +14186,99 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-502-hot-water-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-308-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-308-in"
-            },
-            {
-                "@id": "urn:ex/room-308-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-513-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-water-in",
+        "@id": "urn:ex/zone-104-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-535-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-535-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110",
+        "@id": "urn:ex/vav-533-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-110-hvac-domain"
+                "@id": "urn:ex/vav-533-air-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-309-310-window-switch-on-off",
-        "@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-OnOff"
+                "@id": "urn:ex/vav-533-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil",
+        "@id": "urn:ex/zone-102-heating-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-532-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-532-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-512-damper",
+        "@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": [
             {
-                "@id": "urn:ex/vav-512-damper-in"
+                "@id": "urn:ex/vav-534-damper-in"
             },
             {
-                "@id": "urn:ex/vav-512-damper-out"
+                "@id": "urn:ex/vav-534-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-512-damper-command"
+                "@id": "urn:ex/vav-534-damper-command"
             },
             {
-                "@id": "urn:ex/vav-512-damper-position"
+                "@id": "urn:ex/vav-534-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-air-out",
+        "@id": "urn:ex/zone-201-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@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#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-519-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-519-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-519-air-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207-out",
+        "@id": "urn:ex/room-306-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -14286,29 +14294,34 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-occupancy-sensor",
+        "@id": "urn:ex/vav-508-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-303-hvac-domain"
+                "@id": "urn:ex/vav-508-hot-water-in-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-508-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-310-in",
+        "@id": "urn:ex/vav-516-air-in",
         "@type": [
             "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": [
@@ -14318,135 +14331,116 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-water-out",
+        "@id": "urn:ex/vav-505-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-536-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-518-reheat-coil-valve",
+        "@id": "urn:ex/vav-501-colder-supply-air-requests",
         "@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-518-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-518-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-518-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-air-in",
+        "@id": "urn:ex/vav-525",
         "@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-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#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-525-damper"
+            },
+            {
+                "@id": "urn:ex/vav-525-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-525-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-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/room-105-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-105-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-air-out",
+        "@id": "urn:ex/connection-to-room-302",
         "@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#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-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-539-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-539-discharge-air-temp"
-            },
-            {
-                "@id": "urn:ex/vav-539-discharge-air-temp-setpoint"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-heating-setpoint",
+        "@id": "urn:ex/vav-517-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-517-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-517-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-water-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/vav-513-hot-water-in-connection"
+                "@id": "urn:ex/vav-517-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14456,62 +14450,44 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-513-hot-water-in"
+                "@id": "urn:ex/vav-517-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-air-in",
+        "@id": "urn:ex/vav-510-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-530-duct-after-damper"
+                "@id": "urn:ex/vav-510-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-528-damper",
+        "@id": "urn:ex/vav-501-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-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/vav-501-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-516-more-heat-requests",
-        "@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-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-110-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -14527,152 +14503,148 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ma-temp",
+        "@id": "urn:ex/room-111-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/Temperature"
+                "@id": "urn:ex/room-111-in"
+            },
+            {
+                "@id": "urn:ex/room-111-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-507-heating-pid-output",
+        "@id": "urn:ex/vav-528-duct-after-damper",
         "@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/Dimensionless"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-112-114",
+        "@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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-501-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-516-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-305-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-305-in"
+            },
+            {
+                "@id": "urn:ex/room-305-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-525-reheat-coil-water-in",
+        "@id": "urn:ex/vav-504-damper-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/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-525-hot-water-in"
+                "@id": "urn:ex/vav-504-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-temp",
+        "@id": "urn:ex/vav-530-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "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/VolumeFlowRate"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "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-101-building-static-pressure",
+        "@id": "urn:ex/vav-504-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/Pressure"
-            }
+            "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/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-position",
+        "@id": "urn:ex/room-313",
         "@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#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/room-313-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-out",
+        "@id": "urn:ex/connection-to-room-201",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-ea-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14681,72 +14653,47 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-out-connection",
+        "@id": "urn:ex/vav-507-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-523-air-in",
+        "@id": "urn:ex/vav-528-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-connection-to-vavs"
+                "@id": "urn:ex/vav-528-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-528-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111",
+        "@id": "urn:ex/vav-534-hot-water-in-connection",
         "@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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-111-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-111-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-111-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-111-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-111-temp"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-111-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-command",
+        "@id": "urn:ex/vav-526-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -14762,155 +14709,115 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-temp",
+        "@id": "urn:ex/zone-312-occupancy",
         "@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"
-            }
+            "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/room-302-hvac-domain",
+        "@id": "urn:ex/vav-525-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-302-in"
-            },
-            {
-                "@id": "urn:ex/room-302-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-524-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-537-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-524-air-in"
+                "@id": "urn:ex/vav-537-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve",
+        "@id": "urn:ex/zone-207-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-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#Water-HotWater"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-118-in",
+        "@id": "urn:ex/vav-519-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-118"
+                "@id": "urn:ex/vav-519-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-524-air-in",
+        "@id": "urn:ex/zone-105-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/vav-526-reheat-coil-water-out",
+        "@id": "urn:ex/room-302-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-pipe-hot-water-return-before-valve"
+                "@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/vav-528-reheat-coil",
+        "@id": "urn:ex/vav-516-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-516-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-528-reheat-coil-air-out"
+                "@id": "urn:ex/vav-516-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-528-reheat-coil-water-in"
+                "@id": "urn:ex/vav-516-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-528-reheat-coil-water-out"
+                "@id": "urn:ex/vav-516-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -14920,29 +14827,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-303-304-306-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-303-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-303-304-306-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-103-in",
+        "@id": "urn:ex/room-113-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-103"
+                "@id": "urn:ex/connection-to-room-113"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14952,13 +14859,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-508-air-out",
+        "@id": "urn:ex/vav-520-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-534-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-109"
+                "@id": "urn:ex/connection-to-room-314"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14968,81 +14896,86 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-508-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-508-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-534-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-508-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-534-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-508-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-534-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-in-connection",
+        "@id": "urn:ex/vav-522-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-522-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-118-cooling-setpoint",
+        "@id": "urn:ex/zone-203-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/office-ahu-oa-temp-sensor",
+        "@id": "urn:ex/vav-506-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/office-ahu-oa-damper-in"
+                "@id": "urn:ex/vav-506-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-oa-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-204-205-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-519-air-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@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#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-525-discharge-air-flow",
+        "@id": "urn:ex/vav-516-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -15053,81 +14986,77 @@
         ],
         "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-damper-position",
+        "@id": "urn:ex/vav-510-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-532-cooling-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": "urn:ex/zone-203-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": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-203-hvac-domain",
+        "@id": "urn:ex/vav-504",
         "@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-203-in"
+                "@id": "urn:ex/vav-504-air-in"
             },
             {
-                "@id": "urn:ex/room-203-out"
+                "@id": "urn:ex/vav-504-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-504-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-504-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-504-damper"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-cooling-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#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -15141,214 +15070,221 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-water-out",
+        "@id": "urn:ex/vav-528",
         "@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-518-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-528-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-528-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-528-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-528-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-528-damper"
+            },
+            {
+                "@id": "urn:ex/vav-528-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-521-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-521-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-211-cooling-setpoint",
+        "@id": "urn:ex/room-208-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-208-209"
             }
         ],
-        "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-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-207"
+                "@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-520-discharge-air-flow"
+                "@id": "urn:ex/zone-212-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-520-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-212-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-520-discharge-air-temp"
+                "@id": "urn:ex/zone-212-occupancy"
             },
             {
-                "@id": "urn:ex/vav-520-discharge-air-temp-setpoint"
+                "@id": "urn:ex/zone-212-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-212-temp"
+            },
+            {
+                "@id": "urn:ex/zone-212-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-514-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-520-air-out"
+                "@id": "urn:ex/vav-514-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-520-discharge-air-temp"
+                "@id": "urn:ex/vav-514-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-water-in",
+        "@id": "urn:ex/zone-116-117-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-528-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/room-116-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-528-hot-water-in"
+                "@id": "urn:ex/zone-116-117-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-heating-pid-output",
+        "@id": "urn:ex/zone-305",
         "@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/Dimensionless"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ],
-        "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/room-314-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-314-in"
+                "@id": "urn:ex/zone-305-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/room-314-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+                "@id": "urn:ex/zone-305-heating-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@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/zone-208-209-window-switch-on-off",
+        "@id": "urn:ex/vav-518-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-OnOff"
+                "@id": "urn:ex/vav-518-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper",
+        "@id": "urn:ex/vav-516-hot-water-out-connection",
         "@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-505-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-505-damper-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-505-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-505-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper",
+        "@id": "urn:ex/vav-501-reheat-coil-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-511-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-511-damper-out"
+                "@id": "urn:ex/vav-501-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-511-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-511-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-516-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -15360,79 +15296,74 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-out",
+        "@id": "urn:ex/room-114-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/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/room-116-hvac-domain",
+        "@id": "urn:ex/vav-506-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-116-in"
-            },
+                "@id": "urn:ex/vav-506-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-116-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/vav-506-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-506-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-flow",
+        "@id": "urn:ex/room-206",
         "@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#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-206-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil",
+        "@id": "urn:ex/vav-502-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-540-reheat-coil-air-in"
+                "@id": "urn:ex/vav-502-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-540-reheat-coil-air-out"
+                "@id": "urn:ex/vav-502-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-540-reheat-coil-water-in"
+                "@id": "urn:ex/vav-502-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-540-reheat-coil-water-out"
+                "@id": "urn:ex/vav-502-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -15442,116 +15373,134 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-302-co2-concentration-setpoint",
+        "@id": "urn:ex/vav-517-reheat-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#ofSubstance": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+                "@id": "urn:ex/vav-517-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-517-reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@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/PPM"
+                "@id": "urn:ex/vav-517-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-517-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-damper-out",
+        "@id": "urn:ex/vav-507-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-ea-out-connection"
+                "@id": "urn:ex/vav-507-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-duct-after-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/office-ahu-ea-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-air-out",
+        "@id": "urn:ex/vav-529-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-210"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-529-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-529-damper-out"
             }
         ],
         "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"
+                "@id": "urn:ex/vav-529-damper-command"
             },
             {
-                "@id": "urn:ex/vav-524-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-529-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-water-in",
+        "@id": "urn:ex/room-309-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-309-310"
             }
         ],
         "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-540-discharge-air-temp-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-519-hot-water-in"
+                "@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-526-damper-actuator",
+        "@id": "urn:ex/vav-502-discharge-air-flow-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-526-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-526-damper-command"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-cooling-pid-output",
+        "@id": "urn:ex/vav-532-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -15567,53 +15516,61 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-202-window-switch-on-off",
+        "@id": "urn:ex/office-ahu-air-filter",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#AirFilter",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
         ],
-        "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-air-filter-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-air-filter-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-occupancy",
+        "@id": "urn:ex/vav-503-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-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-519-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-510-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-519-hot-water-out-connection"
+                "@id": "urn:ex/vav-510-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-519-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-hot-water-in-connection",
+        "@id": "urn:ex/vav-515-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-515-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -15622,14 +15579,10 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -15638,45 +15591,45 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-113-occupancy-override",
+        "@id": "urn:ex/vav-534-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-Override"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-hot-water-out",
+        "@id": "urn:ex/vav-531-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-525-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-207-occupancy",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
-            }
+            "http://www.w3.org/2002/07/owl#Ontology"
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-temp",
+        "@id": "urn:ex/vav-518-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -15687,19 +15640,36 @@
         ],
         "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-210-cooling-setpoint",
+        "@id": "urn:ex/office-ahu-chilled-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "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-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": [
             {
@@ -15713,40 +15683,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-water-out",
+        "@id": "urn:ex/vav-518-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-527-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-518-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-526-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/vav-518-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-air-out",
+        "@id": "urn:ex/vav-536-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-312"
+                "@id": "urn:ex/vav-536-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -15756,21 +15720,15 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-537-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-537-discharge-air-temp"
+                "@id": "urn:ex/vav-536-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-537-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-536-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-warmer-supply-air-requests",
+        "@id": "urn:ex/vav-533-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -15781,148 +15739,188 @@
         ]
     },
     {
-        "@id": "urn:ex/room-109",
+        "@id": "urn:ex/vav-538-damper-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-109-hvac-domain"
+                "@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-538-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-hot-water-in-connection",
+        "@id": "urn:ex/vav-526-discharge-air-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/vav-526-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-526-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-hot-water-out",
+        "@id": "urn:ex/zone-113",
         "@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-518-hot-water-out-connection"
+                "@id": "urn:ex/room-113-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#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/office-ahu-sa-flow-sensor",
+        "@id": "urn:ex/vav-510-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-sa-fan-in"
+                "@id": "urn:ex/vav-510-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/office-ahu-sa-flow"
+                "@id": "urn:ex/vav-510-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-temp-sensor",
+        "@id": "urn:ex/office-ahu-ra-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/office-ahu-duct-after-oa-ra-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"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-508-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-508-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-508-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-occupancy-sensor",
+        "@id": "urn:ex/vav-536-damper-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-201-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-201-occupancy"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-flow-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/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-502-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-502-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-201-in",
+        "@id": "urn:ex/room-112-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-201"
+                "@id": "urn:ex/connection-to-room-112-114"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -15932,75 +15930,56 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-305-occupancy-override",
+        "@id": "urn:ex/vav-531-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-106-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-106-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-106-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-537-reheat-coil-water-out",
+        "@id": "urn:ex/vav-503-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-537-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/office-ahu-ra-damper-out",
+        "@id": "urn:ex/vav-507-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
-            }
+            "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-reheat-coil-air-out",
+        "@id": "urn:ex/vav-532-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-309-310"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16010,160 +15989,166 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-heating-pid-output"
+                "@id": "urn:ex/vav-532-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-534-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-532-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-534-air-out"
+                "@id": "urn:ex/vav-532-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-532-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-528-more-heat-requests",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-525-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-air-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": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "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"
+            },
+            {
+                "@id": "urn:ex/vav-516-discharge-air-temp-setpoint"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-514-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/connection-to-room-213",
         "@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-518-reheat-coil-air-in",
+        "@id": "urn:ex/vav-532-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-duct-after-damper"
+                "@id": "urn:ex/vav-532-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-306-in",
+        "@id": "urn:ex/vav-535-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/connection-to-room-303-304-306"
+                "@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/vav-518-reheat-coil",
+        "@id": "urn:ex/vav-527-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-518-reheat-coil-air-in"
-            },
-            {
-                "@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"
+                "@id": "urn:ex/vav-527-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-509-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-307-308-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-509-air-out"
+                "@id": "urn:ex/room-307-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-509-discharge-air-temp"
+                "@id": "urn:ex/zone-307-308-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-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-522-reheat-coil-air-in",
+        "@id": "urn:ex/room-312-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/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16173,23 +16158,7 @@
         ]
     },
     {
-        "@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-540-air-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/vav-540-discharge-air-flow"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-539-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-507-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -16205,108 +16174,101 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-flow",
+        "@id": "urn:ex/vav-503-damper-actuator",
         "@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#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-503-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/vav-503-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-heating-pid-output",
+        "@id": "urn:ex/vav-503-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-504-more-heat-requests",
+        "@id": "urn:ex/room-307-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/connection-to-room-307-308"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-hot-water-out",
+        "@id": "urn:ex/vav-515-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/room-102-hvac-domain",
+        "@id": "urn:ex/vav-519-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "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/room-102-in"
+                "@id": "urn:ex/vav-519-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/room-102-out"
+                "@id": "urn:ex/vav-519-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ea-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-519-reheat-coil-valve-command"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-519-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-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": [
             {
@@ -16320,309 +16282,278 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-312-temp",
+        "@id": "urn:ex/vav-525-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/Temperature"
+                "@id": "urn:ex/vav-525-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-525-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-flow",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-actuator",
         "@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#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-533-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-533-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503",
+        "@id": "urn:ex/vav-540-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-503-air-in"
+                "@id": "urn:ex/vav-540-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-503-air-out"
+                "@id": "urn:ex/vav-540-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-503-hot-water-in"
+                "@id": "urn:ex/vav-540-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-503-hot-water-out"
+                "@id": "urn:ex/vav-540-reheat-coil-water-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#hasRole": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-cooling-pid-output",
+        "@id": "urn:ex/vav-505-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-108"
             }
         ],
-        "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-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/connection-to-room-101",
+        "@id": "urn:ex/vav-518-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-528-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-538-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-528-air-out"
+                "@id": "urn:ex/vav-538-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-528-discharge-air-temp"
+                "@id": "urn:ex/vav-538-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-537-hot-water-in-connection",
         "@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#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/vav-505-reheat-coil-valve",
+        "@id": "urn:ex/room-107-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-in"
+                "@id": "urn:ex/room-107-in"
             },
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/room-107-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207",
+        "@id": "urn:ex/zone-108-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-207-hvac-domain"
+                "@id": "urn:ex/room-108-hvac-domain"
             }
-        ]
-    },
-    {
-        "@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#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/zone-108-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526",
+        "@id": "urn:ex/vav-502-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-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"
+                "@id": "urn:ex/vav-502-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-526-damper"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil-valve"
+                "@id": "urn:ex/vav-502-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-538-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/VolumeFlowRate"
+                "@id": "urn:ex/vav-538-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-538-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-210-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-531-more-heat-requests",
+        "@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-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-525-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-501-air-in",
+        "@id": "urn:ex/vav-507-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-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-532-discharge-air-temp-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/vav-507-reheat-coil-valve-command"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-507-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-in",
+        "@id": "urn:ex/vav-531-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -16638,34 +16569,34 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-521-air-in"
+                "@id": "urn:ex/vav-531-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-523-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-526-reheat-coil-valve"
+                "@id": "urn:ex/vav-523-hot-water-out-connection"
             }
         ],
-        "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-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-water-in",
+        "@id": "urn:ex/vav-514-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-531-hot-water-in-connection"
+                "@id": "urn:ex/vav-514-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16675,160 +16606,171 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-531-hot-water-in"
+                "@id": "urn:ex/vav-514-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-out",
+        "@id": "urn:ex/vav-517-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-203"
             }
         ],
         "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-chilled-water-out"
+                "@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-517-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-colder-supply-air-requests",
+        "@id": "urn:ex/vav-520-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-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-cooling-setpoint",
+        "@id": "urn:ex/vav-530-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-530-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-530-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-occupancy",
+        "@id": "urn:ex/office-ahu-moisture-eliminator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#AirFilter",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
         ],
-        "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-moisture-eliminator-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-moisture-eliminator-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-513-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve"
+                "@id": "urn:ex/vav-513-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-513-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-co2-concentration",
+        "@id": "urn:ex/vav-530-duct-after-damper",
         "@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"
-            }
+            "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/PPM"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-air-out",
+        "@id": "urn:ex/vav-519",
         "@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-204-205"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-519-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:ex/vav-519-air-out"
+            },
             {
-                "@id": "urn:ex/vav-521-discharge-air-flow"
+                "@id": "urn:ex/vav-519-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-521-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-519-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-519-damper"
             },
             {
-                "@id": "urn:ex/vav-521-discharge-air-temp"
+                "@id": "urn:ex/vav-519-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-521-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-519-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-305-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-535-air-out"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-535-discharge-air-temp"
+                "@id": "urn:ex/zone-305-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-in",
+        "@id": "urn:ex/vav-513-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-513-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16836,107 +16778,33 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-505-air-in"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-101",
-        "@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-101-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-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/vav-513-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/zone-101-window-switch-on-off"
-            }
-        ]
-    },
-    {
-        "@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-513-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve",
+        "@id": "urn:ex/zone-201-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-526-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-526-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/room-201-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-position"
+                "@id": "urn:ex/zone-201-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-occupancy-override",
+        "@id": "urn:ex/zone-302-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -16947,50 +16815,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-colder-supply-air-requests",
+        "@id": "urn:ex/zone-202-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-513-heating-pid-output",
+        "@id": "urn:ex/vav-519-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/Dimensionless"
-            }
+            "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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-312-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/room-312-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-312-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-temp",
+        "@id": "urn:ex/zone-201-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17006,58 +16870,79 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-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-528-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-528-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-538-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-506-air-out"
+                "@id": "urn:ex/vav-538-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-506-discharge-air-temp"
+                "@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/vav-523-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-515-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-523-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-523-reheat-coil-valve-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-539-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-516-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#cnx": [
+            {
+                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17066,108 +16951,91 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-510-colder-supply-air-requests",
+        "@id": "urn:ex/zone-103-window-switch-on-off",
         "@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-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-out",
+        "@id": "urn:ex/room-113-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-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-517-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-speed-cmd",
+        "@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-538-reheat-coil-valve-in",
+        "@id": "urn:ex/room-115-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-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-520-hot-water-in",
+        "@id": "urn:ex/vav-518-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-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-202"
             }
         ],
         "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-valve-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-501-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-518-discharge-air-flow"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-518-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-501-hot-water-out"
+                "@id": "urn:ex/vav-518-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-518-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-in",
+        "@id": "urn:ex/vav-502-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -17180,204 +17048,194 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-525-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-202-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-528-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-528-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-out-connection",
+        "@id": "urn:ex/office-ahu-colder-chilled-water-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-502-reheat-coil",
+        "@id": "urn:ex/vav-535-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-502-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-502-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/zone-110-temp-sensor",
+        "@id": "urn:ex/room-312-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-110-hvac-domain"
+                "@id": "urn:ex/connection-to-room-312"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-110-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-heating-setpoint",
+        "@id": "urn:ex/vav-519-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/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/room-215-in",
+        "@id": "urn:ex/zone-118-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-215"
+                "@id": "urn:ex/room-118-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-118-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-duct-after-damper",
+        "@id": "urn:ex/vav-502-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-537-reheat-coil",
+        "@id": "urn:ex/vav-535-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-537-reheat-coil-air-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-water-in"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-311-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-Heating"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-occupancy-override",
+        "@id": "urn:ex/vav-519-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-511-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-532-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/vav-511-air-out"
+                "@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-511-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-hot-water-out",
+        "@id": "urn:ex/vav-502-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-503-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://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-water-out",
+        "@id": "urn:ex/vav-508-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-535-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-508-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17387,199 +17245,251 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-in",
+        "@id": "urn:ex/vav-537-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "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-502-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-505-hot-water-in-connection"
+                "@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-Water"
+                "@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-509-air-in",
+        "@id": "urn:ex/vav-537-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-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#mapsTo": [
+            {
+                "@id": "urn:ex/vav-537-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529",
+        "@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#cnx": [
             {
-                "@id": "urn:ex/vav-529-air-in"
+                "@id": "urn:ex/vav-515-air-in"
             },
             {
-                "@id": "urn:ex/vav-529-air-out"
+                "@id": "urn:ex/vav-515-air-out"
             },
             {
-                "@id": "urn:ex/vav-529-hot-water-in"
+                "@id": "urn:ex/vav-515-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-529-hot-water-out"
+                "@id": "urn:ex/vav-515-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-529-damper"
+                "@id": "urn:ex/vav-515-damper"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil"
+                "@id": "urn:ex/vav-515-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve"
+                "@id": "urn:ex/vav-515-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-510-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-538-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-510-reheat-coil-valve-command",
+        "@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#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-314",
+        "@id": "urn:ex/vav-526-hot-water-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-314-hvac-domain"
+                "@id": "urn:ex/vav-526-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-position",
+        "@id": "urn:ex/vav-521-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-520-damper-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/office-ahu-connection-to-vavs"
+                "@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-Air"
+                "@id": "urn:ex/zone-210-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ra-fan-start-status",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-520-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-310-out",
+        "@id": "urn:ex/vav-508-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-508-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-508-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil",
+        "@id": "urn:ex/vav-510-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "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-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-air-out"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-534-reheat-coil-water-in"
-            },
+                "@id": "urn:ex/vav-510-reheat-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-window-switch-on-off",
+        "@id": "urn:ex/vav-532-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-OnOff"
+                "@id": "urn:ex/vav-532-reheat-coil-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-521-colder-supply-air-requests",
-        "@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-HVACOperatingMode"
+                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-occupancy",
+        "@id": "urn:ex/zone-210-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -17590,261 +17500,268 @@
         ]
     },
     {
-        "@id": "urn:ex/room-312-in",
+        "@id": "urn:ex/vav-515-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-312"
+                "@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-511-more-heat-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/vav-515-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-cooling-setpoint",
+        "@id": "urn:ex/vav-510-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/vav-531-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-514-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-531-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-531-hot-water-out"
+                "@id": "urn:ex/vav-514-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-occupancy-sensor",
+        "@id": "urn:ex/vav-531-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-101-hvac-domain"
+                "@id": "urn:ex/vav-531-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-101-occupancy"
+                "@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-512-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-521-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-512-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
         "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-521-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-521-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-521-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-521-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-temp-setpoint",
+        "@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": [
             {
-                "@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-104-occupancy",
+        "@id": "urn:ex/connection-to-room-110",
         "@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-508-hot-water-in",
+        "@id": "urn:ex/vav-502-duct-after-damper",
         "@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#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-reheat-coil-valve",
+        "@id": "urn:ex/vav-505-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-302-heating-setpoint",
+        "@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#Water-HotWater"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-htg-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-506-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-htg-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-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-506-hot-water-out"
+                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-flow-setpoint",
+        "@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/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-512-discharge-air-flow",
+        "@id": "urn:ex/vav-508-cooling-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-540-hot-water-in-connection",
+        "@id": "urn:ex/vav-511-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-538-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/vav-510-air-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/connection-to-room-111"
+                "@id": "urn:ex/connection-to-room-104"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17854,108 +17771,85 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-510-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-510-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-503-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-510-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-503-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-510-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-503-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-command",
+        "@id": "urn:ex/room-114-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-114-in"
+            },
+            {
+                "@id": "urn:ex/room-114-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/room-105",
+        "@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-105-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/zone-108-temp-sensor",
+        "@id": "urn:ex/zone-105-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-108-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-108-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207",
+        "@id": "urn:ex/vav-535-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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-207-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-207-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-207-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-207-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-207-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-207-temp"
-            },
-            {
-                "@id": "urn:ex/zone-207-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-311-in",
+        "@id": "urn:ex/vav-518-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-311"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17964,438 +17858,411 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-517-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-311-temp-sensor",
+        "@id": "urn:ex/vav-530-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/room-311-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/zone-311-temp"
+                "@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",
+        "@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-504-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-504-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-504-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-504-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-105-out",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-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-521-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-521-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-heating-pid-output",
+        "@id": "urn:ex/zone-204-205-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": "urn:ex/vav-530-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://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-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-516-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-516-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-516-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-530-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-530-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve",
+        "@id": "urn:ex/vav-517-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-533-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-516-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-527-reheat-coil-valve"
+                "@id": "urn:ex/connection-to-room-201"
             }
         ],
-        "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-525-reheat-coil-valve-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-516-heating-pid-output"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-516-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-525-hot-water-out"
+                "@id": "urn:ex/vav-516-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-208-in",
+        "@id": "urn:ex/vav-505-discharge-air-temp-setpoint",
         "@type": [
-            "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#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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-116-117-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-531",
+        "@id": "urn:ex/office-ahu-clg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "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/vav-531-air-in"
+                "@id": "urn:ex/office-ahu-clg-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-531-air-out"
+                "@id": "urn:ex/office-ahu-clg-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-531-hot-water-in"
+                "@id": "urn:ex/office-ahu-clg-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-531-hot-water-out"
+                "@id": "urn:ex/office-ahu-clg-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-Cooling"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-512-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-512-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-510-damper-command",
+        "@id": "urn:ex/vav-519-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-519-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-519-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-205-out",
+        "@id": "urn:ex/vav-540-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-501-hot-water-in",
+        "@id": "urn:ex/vav-521-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-501-hot-water-in-connection"
+                "@id": "urn:ex/vav-521-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-521-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-521-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-207-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/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-536-hot-water-in",
+        "@id": "urn:ex/vav-524-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"
+                "@id": "urn:ex/vav-524-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-524-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper",
+        "@id": "urn:ex/vav-502-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/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/Dimensionless"
+                "@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/UNITLESS"
+                "@id": "urn:ex/vav-522-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-522-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-command",
         "@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-535-reheat-coil-valve-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-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/vav-519-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-535-reheat-coil-valve-command"
-            },
+                "@id": "urn:ex/vav-519-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-510-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-116-117",
+        "@id": "urn:ex/zone-213",
         "@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-116-hvac-domain"
-            },
-            {
-                "@id": "urn:ex/room-117-hvac-domain"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -18405,114 +18272,96 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-116-117-cooling-setpoint"
+                "@id": "urn:ex/zone-213-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-116-117-heating-setpoint"
+                "@id": "urn:ex/zone-213-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-116-117-occupancy"
+                "@id": "urn:ex/zone-213-occupancy"
             },
             {
-                "@id": "urn:ex/zone-116-117-occupancy-override"
+                "@id": "urn:ex/zone-213-occupancy-override"
             },
             {
-                "@id": "urn:ex/zone-116-117-temp"
+                "@id": "urn:ex/zone-213-temp"
             },
             {
-                "@id": "urn:ex/zone-116-117-window-switch-on-off"
+                "@id": "urn:ex/zone-213-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-water-in",
+        "@id": "urn:ex/vav-522-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-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-518-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-actuator",
+        "@id": "urn:ex/zone-213-cooling-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-502-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-502-damper-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523",
+        "@id": "urn:ex/vav-532-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#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "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://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-523-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-312-hvac-domain",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-523-damper"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil"
+                "@id": "urn:ex/room-312-in"
             },
             {
-                "@id": "urn:ex/vav-523-reheat-coil-valve"
+                "@id": "urn:ex/room-312-out"
             }
-        ]
-    },
-    {
-        "@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": [
+        "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-532-reheat-coil-air-in",
+        "@id": "urn:ex/vav-530-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18522,538 +18371,395 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-heating-pid-output",
+        "@id": "urn:ex/zone-204-205-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-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-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-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-connection-to-vavs"
+                "@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#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-513-air-in"
+                "@id": "urn:ex/vav-527-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-527-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-air-filter",
+        "@id": "urn:ex/vav-524-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#AirFilter",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-air-filter-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-air-filter-out"
+                "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@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#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-116-in",
+        "@id": "urn:ex/office-ahu-ra-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-116-117"
+                "@id": "urn:ex/office-ahu-ra-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/office-ahu-ra-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-303-304-306-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-520-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-520-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-206-out",
+        "@id": "urn:ex/zone-101-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/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-503-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-504-damper-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/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"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-503-hot-water-out"
+                "@id": "urn:ex/vav-504-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-504-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-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-508-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-528-hot-water-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/vav-528-hot-water-in-connection"
+                "@id": "urn:ex/vav-501-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-214-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/vav-501-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-501-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-valve-command",
+        "@id": "urn:ex/zone-307-308-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": "urn:ex/room-308-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": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil",
+        "@id": "urn:ex/room-109",
         "@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-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"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/room-109-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-ra-fan",
+        "@id": "urn:ex/zone-211-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-535-hot-water-in",
+        "@id": "urn:ex/office-ahu-htg-coil-air-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-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/room-305-hvac-domain",
+        "@id": "urn:ex/vav-527-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-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/connection-to-room-301"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-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-115-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/vav-527-discharge-air-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-520-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/vav-527-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-527-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-527-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper",
+        "@id": "urn:ex/vav-517-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-519-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-519-damper-out"
+                "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-519-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-air-in",
+        "@id": "urn:ex/zone-101-window-switch-on-off",
         "@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-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-air-in",
+        "@id": "urn:ex/vav-540-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-520-duct-after-damper"
+                "@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/vav-508-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-508-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/vav-540-reheat-coil-valve-command"
+            },
             {
-                "@id": "urn:ex/vav-508-damper-command"
+                "@id": "urn:ex/vav-540-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-302",
+        "@id": "urn:ex/vav-531-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-air-filter-in",
+        "@id": "urn:ex/vav-536-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-oa-ra-damper"
+                "@id": "urn:ex/vav-536-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/office-ahu-ma-temp"
+                "@id": "urn:ex/vav-536-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-air-out",
+        "@id": "urn:ex/room-314-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-210"
+                "@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-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-507-hot-water-out",
+        "@id": "urn:ex/vav-537-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-507-hot-water-out-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-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil",
+        "@id": "urn:ex/vav-539-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-water-out"
+                "@id": "urn:ex/vav-539-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-539-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210",
+        "@id": "urn:ex/zone-110-occupancy-override",
         "@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#EnumeratedObservableProperty"
         ],
-        "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#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-210-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
@@ -19069,18 +18775,19 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-occupancy",
+        "@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-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-538-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -19092,74 +18799,87 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper-actuator",
+        "@id": "urn:ex/office-ahu-oa-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-519-damper"
+                "@id": "urn:ex/office-ahu-oa-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-103-hvac-domain",
+        "@id": "urn:ex/vav-507-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-103-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-103-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/office-ahu-htg-coil-valve-position",
+        "@id": "urn:ex/vav-511-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/DimensionlessRatio"
+                "@id": "urn:ex/vav-511-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-522-hot-water-out",
+        "@id": "urn:ex/vav-512",
         "@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-522-hot-water-out-connection"
+                "@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"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-512-damper"
+            },
+            {
+                "@id": "urn:ex/vav-512-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-512-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-108",
+        "@id": "urn:ex/connection-to-room-211",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -19171,61 +18891,61 @@
         ]
     },
     {
-        "@id": "urn:ex/room-314-in",
+        "@id": "urn:ex/vav-532-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-314"
+                "@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-509-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-509-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"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-533-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-temp-sensor",
+        "@id": "urn:ex/office-ahu-ra-fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-537-air-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-water-in",
+        "@id": "urn:ex/vav-532-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-hot-water-in-connection"
+                "@id": "urn:ex/vav-532-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19235,26 +18955,19 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-516-hot-water-in"
+                "@id": "urn:ex/vav-532-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-duct-after-damper",
+        "@id": "urn:ex/vav-515-discharge-air-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-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-301-cooling-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -19268,156 +18981,178 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-ra-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/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-109-temp-sensor",
+        "@id": "urn:ex/vav-524-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/vav-503-reheat-coil-valve",
+        "@id": "urn:ex/vav-507-damper-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-503-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "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-503-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-507-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502",
+        "@id": "urn:ex/vav-513-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-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"
+                "@id": "urn:ex/vav-513-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-502-damper"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil"
-            },
+                "@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://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-window-switch-on-off",
+        "@id": "urn:ex/zone-104-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/vav-523-air-out",
+        "@id": "urn:ex/vav-531-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/connection-to-room-206"
+                "@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-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-523-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-519-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-519-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-523-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-519-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-523-discharge-air-temp"
+                "@id": "urn:ex/vav-519-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-523-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-519-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-more-heat-requests",
+        "@id": "urn:ex/vav-523-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-523-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-523-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-temp",
+        "@id": "urn:ex/zone-213-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -19433,69 +19168,94 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-cooling-pid-output",
+        "@id": "urn:ex/vav-535-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-108-hvac-domain",
+        "@id": "urn:ex/vav-505-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "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/room-108-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-htg-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-108-out"
+                "@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/vav-524-hot-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-524-hot-water-out-connection"
+                "@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/office-ahu-htg-coil-valve-actuator",
+        "@id": "urn:ex/zone-307-308-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/office-ahu-htg-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-306-in",
+        "@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#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
@@ -19512,37 +19272,48 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper",
+        "@id": "urn:ex/zone-212-occupancy-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-531-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-531-damper-out"
+                "@id": "urn:ex/room-212-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-531-damper-command"
-            },
+                "@id": "urn:ex/zone-212-occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-514-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-531-damper-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-hot-water-out",
+        "@id": "urn:ex/vav-512-more-heat-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-521-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-501-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": [
             {
@@ -19551,125 +19322,134 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-temp",
+        "@id": "urn:ex/vav-530-discharge-air-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/vav-530-air-out"
             }
         ],
-        "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-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-duct-after-htg-coil",
+        "@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/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil",
+        "@id": "urn:ex/office-ahu-oa-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/vav-512-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-water-out"
+                "@id": "urn:ex/office-ahu-duct-after-oa-ra-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",
+        "@id": "urn:ex/vav-503-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-522-reheat-coil-air-in"
+                "@id": "urn:ex/vav-503-damper-in"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-air-out"
-            },
+                "@id": "urn:ex/vav-503-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-522-reheat-coil-water-in"
+                "@id": "urn:ex/vav-503-damper-command"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-water-out"
+                "@id": "urn:ex/vav-503-damper-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-528-discharge-air-temp-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/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-water-out",
+        "@id": "urn:ex/room-112-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-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-508-damper",
+        "@id": "urn:ex/vav-520-more-heat-requests",
         "@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": [
-            {
-                "@id": "urn:ex/vav-508-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-508-damper-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-113-occupancy-override",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-508-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-508-damper-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-water-out",
+        "@id": "urn:ex/vav-528-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-528-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19679,29 +19459,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527-hot-water-in",
+        "@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-527-hot-water-in-connection"
+                "@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-536-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-514-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-521-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-514-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19711,174 +19496,172 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-503-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/room-210-out",
+        "@id": "urn:ex/vav-513-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-513-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-115-temp-sensor",
+        "@id": "urn:ex/zone-213-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-115-hvac-domain"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-115-temp"
+                "@id": "urn:ex/zone-213-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-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-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-501-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-507-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-501-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-501-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-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-516-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-501-discharge-air-flow-setpoint",
+        "@id": "urn:ex/room-104-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/connection-to-room-104"
             }
         ],
-        "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-533-cooling-pid-output",
+        "@id": "urn:ex/zone-302-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-302-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-302-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-duct-after-damper",
+        "@id": "urn:ex/vav-520-reheat-coil-valve-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-520-hot-water-out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-540-damper-command",
-        "@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/DimensionlessRatio"
+                "@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/PERCENT"
+                "@id": "urn:ex/vav-520-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-more-heat-requests",
+        "@id": "urn:ex/vav-519-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-HVACOperatingMode"
+                "@id": "urn:ex/vav-519-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-temp",
+        "@id": "urn:ex/vav-525-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -19899,219 +19682,195 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-201-temp-sensor",
+        "@id": "urn:ex/vav-505-damper-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-201-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-201-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508",
+        "@id": "urn:ex/office-ahu-duct-after-air-filter",
         "@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#Duct"
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@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": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-105-occupancy-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-519-reheat-coil-valve"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
+                "@id": "urn:ex/zone-105-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-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/office-ahu-connection-to-vavs"
+                "@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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-522-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-air-in",
+        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-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-connection-to-vavs"
+                "@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#Medium-Air"
+                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-cooling-setpoint",
+        "@id": "urn:ex/vav-539-reheat-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://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-539-reheat-coil-valve-in"
+            },
+            {
+                "@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/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-air-out",
+        "@id": "urn:ex/vav-501-reheat-coil-valve-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-501-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-531-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-531-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-531-air-out"
+                "@id": "urn:ex/vav-501-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-202",
+        "@id": "urn:ex/vav-521-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-202-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
+                "@id": "urn:ex/vav-521-reheat-coil-air-in"
+            },
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve"
+                "@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#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-occupancy-sensor",
+        "@id": "urn:ex/zone-309-310-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-206-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-206-occupancy"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-water-out",
+        "@id": "urn:ex/vav-528-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-524-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/zone-103",
+        "@id": "urn:ex/zone-307-308",
         "@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"
+                "@id": "urn:ex/room-307-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-308-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -20121,175 +19880,189 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-103-cooling-setpoint"
+                "@id": "urn:ex/zone-307-308-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-103-heating-setpoint"
+                "@id": "urn:ex/zone-307-308-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-103-occupancy"
+                "@id": "urn:ex/zone-307-308-occupancy"
             },
             {
-                "@id": "urn:ex/zone-103-occupancy-override"
+                "@id": "urn:ex/zone-307-308-occupancy-override"
             },
             {
-                "@id": "urn:ex/zone-103-temp"
+                "@id": "urn:ex/zone-307-308-temp"
             },
             {
-                "@id": "urn:ex/zone-103-window-switch-on-off"
+                "@id": "urn:ex/zone-307-308-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-117",
+        "@id": "urn:ex/vav-510-discharge-air-flow-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-117-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-208-209",
-        "@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/zone-115-occupancy-override",
+        "@id": "urn:ex/room-213-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/office-ahu-ra-fan-start-cmd",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "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/office-ahu-htg-coil-air-out",
+        "@id": "urn:ex/vav-530-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-530-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-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-522-hot-water-out-connection"
+                "@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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@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-522-hot-water-out"
+                "@id": "urn:ex/vav-525-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-205-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-534-reheat-coil-valve-in",
+        "@id": "urn:ex/room-215-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-534-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-215-in"
+            },
+            {
+                "@id": "urn:ex/room-215-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-525-damper-actuator",
+        "@id": "urn:ex/zone-215-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-525-damper"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-525-damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-515-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-539-air-out"
+                "@id": "urn:ex/vav-515-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-539-discharge-air-temp"
+                "@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-506-air-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/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-528-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -20299,66 +20072,63 @@
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#Role-Outside",
+        "@id": "urn:ex/vav-509-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind-Role"
+            "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-214-cooling-setpoint",
+        "@id": "urn:ex/vav-529-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-530-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-517-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-530-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-517-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-517-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-206-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-532-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-206-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-532-hot-water-out"
+                "@id": "urn:ex/zone-206-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-heating-pid-output",
+        "@id": "urn:ex/vav-527-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -20374,160 +20144,151 @@
         ]
     },
     {
-        "@id": "urn:ex/room-312-hvac-domain",
+        "@id": "urn:ex/vav-521-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-312-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-312-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-534-colder-supply-air-requests",
+        "@id": "urn:ex/vav-514-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/zone-116-117-temp",
+        "@id": "urn:ex/vav-519-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-201-temp",
+        "@id": "urn:ex/room-305-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/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-504-reheat-coil-valve",
+        "@id": "urn:ex/vav-538",
         "@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-504-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-538-air-in"
             },
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-538-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-538-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-538-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-538-damper"
             },
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-538-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-116-117-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-536-air-in"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110-in",
+        "@id": "urn:ex/zone-215",
         "@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/connection-to-room-110"
+                "@id": "urn:ex/room-215-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-505-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#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-306-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/zone-215-cooling-setpoint"
+            },
             {
-                "@id": "urn:ex/room-306-in"
+                "@id": "urn:ex/zone-215-heating-setpoint"
             },
             {
-                "@id": "urn:ex/room-306-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+                "@id": "urn:ex/zone-215-occupancy"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@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/vav-527-air-in",
+        "@id": "urn:ex/vav-519-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -20543,9 +20304,20 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-position",
+        "@id": "urn:ex/room-201",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-201-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-516-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -20559,72 +20331,77 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-more-heat-requests",
+        "@id": "urn:ex/vav-525-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-oa-damper-actuator",
+        "@id": "urn:ex/vav-527-discharge-air-temp-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-oa-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-508-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-526-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-526-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-temp-sensor",
+        "@id": "urn:ex/vav-517-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-202-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-202-temp"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-hot-water-out",
+        "@id": "urn:ex/vav-537-hot-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-537-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -20634,268 +20411,223 @@
         ]
     },
     {
-        "@id": "urn:ex/room-109-out",
+        "@id": "urn:ex/vav-531-discharge-air-flow",
         "@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#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/zone-109-cooling-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/vav-521-air-in",
+        "@id": "urn:ex/vav-536-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-536-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-301-occupancy-override",
-        "@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#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-water-in",
+        "@id": "urn:ex/vav-539-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-529-hot-water-in-connection"
+                "@id": "urn:ex/vav-539-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-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-air-out",
+        "@id": "urn:ex/vav-517-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-116-117"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-517-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-517-damper-out"
             }
         ],
         "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-517-damper-command"
             },
             {
-                "@id": "urn:ex/vav-515-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-517-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-109-hvac-domain",
+        "@id": "urn:ex/vav-535-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-109-in"
-            },
-            {
-                "@id": "urn:ex/room-109-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-537-reheat-coil-water-in",
+        "@id": "urn:ex/vav-533-damper-command",
         "@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#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-537-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-window-switch-on-off",
+        "@id": "urn:ex/vav-512-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-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-538-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-510-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-214-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-510-reheat-coil-valve"
+                "@id": "urn:ex/room-214-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
+                "@id": "urn:ex/zone-214-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-in",
+        "@id": "urn:ex/vav-529-reheat-coil-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-529-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-526-air-in"
+                "@id": "urn:ex/vav-529-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-damper",
+        "@id": "urn:ex/vav-514-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/office-ahu-ea-damper-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ea-damper-out"
+                "@id": "urn:ex/vav-514-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-ea-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-ea-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Exhaust"
+                "@id": "urn:ex/vav-514-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-command",
+        "@id": "urn:ex/zone-311-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-536-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#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20904,75 +20636,56 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-out",
+        "@id": "urn:ex/vav-540-hot-water-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/vav-540-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-525-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-525-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-temp",
+        "@id": "urn:ex/room-302-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-302-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-302-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/zone-302-occupancy-sensor",
+        "@id": "urn:ex/zone-206-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-302-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-302-occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-529-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20981,106 +20694,45 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-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-538-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-538-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-538-damper-command"
-            },
-            {
-                "@id": "urn:ex/vav-538-damper-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-511-air-out",
+        "@id": "urn:ex/vav-501-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-112-114"
+                "@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#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"
-            },
-            {
-                "@id": "urn:ex/vav-511-discharge-air-temp-setpoint"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-103-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-520-reheat-coil-air-out",
+        "@id": "urn:ex/vav-526-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-207"
+                "@id": "urn:ex/vav-526-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-520-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-520-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-520-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-206-in",
+        "@id": "urn:ex/vav-529-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-206"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21090,66 +20742,64 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-504-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-536-air-out"
+                "@id": "urn:ex/vav-504-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-temp"
+                "@id": "urn:ex/vav-504-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-flow",
+        "@id": "urn:ex/vav-503-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/zone-307-308-cooling-setpoint",
+        "@id": "urn:ex/vav-508-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-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"
+            }
+        ],
+        "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/vav-509-air-out",
+        "@id": "urn:ex/office-ahu-sa-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-113"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21159,69 +20809,84 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-509-discharge-air-flow"
+                "@id": "urn:ex/office-ahu-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-509-discharge-air-flow-setpoint"
+                "@id": "urn:ex/office-ahu-increased-air-pressure-requests"
             },
             {
-                "@id": "urn:ex/vav-509-discharge-air-temp"
+                "@id": "urn:ex/office-ahu-sa-temp"
             },
             {
-                "@id": "urn:ex/vav-509-discharge-air-temp-setpoint"
+                "@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"
+            },
+            {
+                "@id": "urn:ex/office-ahu-warmer-supply-air-requests"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-heating-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/vav-532-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-502-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/VolumeFlowRate"
+                "@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/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-502-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-heating-setpoint",
+        "@id": "urn:ex/vav-518-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/vav-503-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"
@@ -21233,138 +20898,120 @@
         ]
     },
     {
-        "@id": "urn:ex/room-303",
+        "@id": "urn:ex/vav-534-colder-supply-air-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-303-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-101-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/connection-to-room-101"
+                "@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-503-duct-after-damper",
+        "@id": "urn:ex/zone-311-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-311-hvac-domain"
             }
-        ]
-    },
-    {
-        "@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": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-311-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-528-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-526-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/zone-215",
+        "@id": "urn:ex/vav-518",
         "@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-518-air-in"
             },
             {
-                "@id": "urn:ex/zone-215-heating-setpoint"
+                "@id": "urn:ex/vav-518-air-out"
             },
             {
-                "@id": "urn:ex/zone-215-occupancy"
+                "@id": "urn:ex/vav-518-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-215-occupancy-override"
+                "@id": "urn:ex/vav-518-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-518-damper"
             },
             {
-                "@id": "urn:ex/zone-215-temp"
+                "@id": "urn:ex/vav-518-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-215-window-switch-on-off"
+                "@id": "urn:ex/vav-518-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-in",
+        "@id": "urn:ex/zone-313-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-313-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-518-air-in"
+                "@id": "urn:ex/zone-313-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-water-out",
+        "@id": "urn:ex/vav-508-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-538-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21374,97 +21021,92 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-position",
+        "@id": "urn:ex/vav-524-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-524-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-537-reheat-coil-valve",
+        "@id": "urn:ex/room-110",
         "@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-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#Water-HotWater"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-position"
+                "@id": "urn:ex/room-110-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-air-in",
+        "@id": "urn:ex/zone-314-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-534-duct-after-damper"
+                "@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-Air"
+                "@id": "urn:ex/zone-314-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper",
+        "@id": "urn:ex/vav-528-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-529-damper-in"
+                "@id": "urn:ex/vav-528-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-529-damper-out"
+                "@id": "urn:ex/vav-528-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-529-damper-command"
+                "@id": "urn:ex/vav-528-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-529-damper-position"
+                "@id": "urn:ex/vav-528-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-301-occupancy",
         "@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-520-pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -21473,204 +21115,153 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-flow",
+        "@id": "urn:ex/vav-509-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-536-reheat-coil-air-in",
+        "@id": "urn:ex/vav-516-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-536-duct-after-damper"
+                "@id": "urn:ex/vav-516-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-516-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-occupancy-sensor",
+        "@id": "urn:ex/vav-526-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-108-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-108-occupancy"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110",
+        "@id": "urn:ex/vav-512-damper-position",
         "@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/DimensionlessRatio"
             }
         ],
-        "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/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308",
+        "@id": "urn:ex/vav-503-discharge-air-temp-setpoint",
         "@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-307-hvac-domain"
-            },
-            {
-                "@id": "urn:ex/room-308-hvac-domain"
-            }
+            "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-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"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-307-308-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve"
+                "@id": "urn:ex/vav-507-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-temp",
+        "@id": "urn:ex/vav-515-cooling-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/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-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-508-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-530-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-530-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-in-connection",
+        "@id": "urn:ex/vav-523-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "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-523-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-523-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-540-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -21684,453 +21275,454 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-moisture-eliminator-out",
+        "@id": "urn:ex/vav-534-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/office-ahu-duct-after-moisture-eliminator"
+                "@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-530-hot-water-in-connection",
+        "@id": "urn:ex/vav-504-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-533",
+        "@id": "urn:ex/office-ahu-oa-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-533-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-533-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-533-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-533-hot-water-out"
+                "@id": "urn:ex/office-ahu-oa-damper-in"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-533-damper"
-            },
-            {
-                "@id": "urn:ex/vav-533-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-oa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522",
+        "@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-522-air-in"
+                "@id": "urn:ex/vav-524-air-in"
             },
             {
-                "@id": "urn:ex/vav-522-air-out"
+                "@id": "urn:ex/vav-524-air-out"
             },
             {
-                "@id": "urn:ex/vav-522-hot-water-in"
+                "@id": "urn:ex/vav-524-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-522-hot-water-out"
+                "@id": "urn:ex/vav-524-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-522-damper"
+                "@id": "urn:ex/vav-524-damper"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil"
+                "@id": "urn:ex/vav-524-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-valve"
+                "@id": "urn:ex/vav-524-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-117-hvac-domain",
+        "@id": "urn:ex/vav-533-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-117-in"
-            },
-            {
-                "@id": "urn:ex/room-117-out"
+                "@id": "urn:ex/vav-533-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/room-108",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-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-108-hvac-domain"
+                "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-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/vav-505-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-oa-damper-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-oa-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-oa-damper-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-oa-damper-position"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-505-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Economizer"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-313",
+        "@id": "urn:ex/vav-507-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-313-hvac-domain"
+                "@id": "urn:ex/vav-507-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-507-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-507-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-507-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-hot-water-in-connection",
+        "@id": "urn:ex/zone-201-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-534-damper-command",
+        "@id": "urn:ex/zone-314-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-508-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-531-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-508-reheat-coil-valve"
+                "@id": "urn:ex/vav-531-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-531-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-cooling-pid-output",
+        "@id": "urn:ex/vav-510-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-518-damper-position",
+        "@id": "urn:ex/zone-103",
         "@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/DimensionlessRatio"
+                "@id": "urn:ex/room-103-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"
             }
-        ]
-    },
-    {
-        "@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": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-513-discharge-air-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+                "@id": "urn:ex/zone-103-cooling-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/zone-103-heating-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-103-occupancy"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-307-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/zone-103-occupancy-override"
+            },
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/zone-103-temp"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/zone-103-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-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-534-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-heating-setpoint",
+        "@id": "urn:ex/vav-519-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-305-temp",
+        "@id": "urn:ex/vav-514-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/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-525-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-506-hot-water-in",
+        "@id": "urn:ex/vav-539-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-hot-water-in-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/zone-301-occupancy-sensor",
+        "@id": "urn:ex/room-113",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-301-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/zone-301-occupancy"
+                "@id": "urn:ex/room-113-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-actuator",
+        "@id": "urn:ex/vav-539",
         "@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-537-damper"
+                "@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/vav-539-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-537-damper-command"
+                "@id": "urn:ex/vav-539-damper"
+            },
+            {
+                "@id": "urn:ex/vav-539-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-cooling-pid-output",
+        "@id": "urn:ex/vav-505-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-108"
             }
         ],
-        "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-505-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-505-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-505-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-505-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-cooling-setpoint",
+        "@id": "urn:ex/vav-504-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-519-colder-supply-air-requests",
+        "@id": "urn:ex/zone-110-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-110-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-110-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-air-in",
+        "@id": "urn:ex/vav-528-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -22143,65 +21735,47 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-531-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": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-528-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper",
+        "@id": "urn:ex/vav-503-heating-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-534-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-534-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-534-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-534-damper-position"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-heating-pid-output",
+        "@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/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-526-discharge-air-temp",
+        "@id": "urn:ex/vav-523-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -22222,90 +21796,98 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-heating-pid-output",
+        "@id": "urn:ex/vav-528-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-202",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-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-531-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-531-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-205-in",
+        "@id": "urn:ex/vav-530-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/connection-to-room-204-205"
+                "@id": "urn:ex/vav-530-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-532-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/office-ahu-oa-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "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/office-ahu-oa-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/office-ahu-oa-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-water-in",
+        "@id": "urn:ex/vav-532-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-509-hot-water-in-connection"
+                "@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-509-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-water-in",
+        "@id": "urn:ex/vav-533-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-526-hot-water-in-connection"
+                "@id": "urn:ex/vav-533-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22315,61 +21897,63 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-526-hot-water-in"
+                "@id": "urn:ex/vav-533-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-actuator",
+        "@id": "urn:ex/vav-523-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-505-damper"
-            }
+            "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-505-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-203-out",
+        "@id": "urn:ex/vav-532-more-heat-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/office-ahu-connection-from-rooms"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-colder-supply-air-requests",
+        "@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-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-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-511-damper-in",
+        "@id": "urn:ex/vav-511-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-112-114"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22377,20 +21961,28 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-511-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-511-more-heat-requests"
+            }
+        ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-511-air-in"
+                "@id": "urn:ex/vav-511-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-hot-water-in",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-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/vav-522-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22400,128 +21992,147 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-colder-supply-air-requests",
+        "@id": "urn:ex/vav-537-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-512-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-531-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/vav-535-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-311"
-            }
-        ],
-        "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-535-discharge-air-flow"
+                "@id": "urn:ex/office-ahu-ra-fan-power"
             },
             {
-                "@id": "urn:ex/vav-535-discharge-air-flow-setpoint"
+                "@id": "urn:ex/office-ahu-ra-fan-speed-cmd"
             },
             {
-                "@id": "urn:ex/vav-535-discharge-air-temp"
+                "@id": "urn:ex/office-ahu-ra-fan-speed-status"
             },
             {
-                "@id": "urn:ex/vav-535-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/vav-521-discharge-air-temp-sensor",
+        "@id": "urn:ex/room-117",
         "@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:ex/vav-521-air-out"
+                "@id": "urn:ex/room-117-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-damper-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#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-521-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539",
+        "@id": "urn:ex/vav-531-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-539-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-539-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-539-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-539-hot-water-out"
+                "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-539-damper"
-            },
-            {
-                "@id": "urn:ex/vav-539-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-539-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-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-515-damper-command",
+        "@id": "urn:ex/connection-to-room-104",
+        "@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-524-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -22537,301 +22148,281 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-air-in",
+        "@id": "urn:ex/vav-534-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-531-duct-after-damper"
+                "@id": "urn:ex/vav-534-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-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-534-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113",
+        "@id": "urn:ex/vav-528-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-113-hvac-domain"
+                "@id": "urn:ex/vav-528-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-113-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-113-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-113-occupancy"
+                "@id": "urn:ex/vav-528-colder-supply-air-requests"
             },
             {
-                "@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-528-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209",
+        "@id": "urn:ex/room-202-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-208-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-209-hvac-domain"
+                "@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/vav-505-discharge-air-temp-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-208-209-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-208-209-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-208-209-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-208-209-occupancy-override"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/zone-208-209-temp"
-            },
+                "@id": "urn:ex/vav-505-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-208-209-window-switch-on-off"
+                "@id": "urn:ex/vav-505-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-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/room-302-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/connection-to-room-302"
+                "@id": "urn:ex/vav-539-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-101-temp-sensor",
+        "@id": "urn:ex/zone-309-310-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-101-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-101-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-512-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-504-air-in"
+                "@id": "urn:ex/vav-512-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-504-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-temp-sensor",
+        "@id": "urn:ex/vav-518-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-212-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-212-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-hot-water-in",
+        "@id": "urn:ex/vav-538-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-524-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-506-damper",
+        "@id": "urn:ex/office-ahu-ea-damper-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-506-damper-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-506-damper-out"
+                "@id": "urn:ex/office-ahu-ea-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-506-damper-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-506-damper-position"
+                "@id": "urn:ex/office-ahu-ea-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-506-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-509-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-506-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-506-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-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-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-526-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-526-hot-water-out"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
+        "@id": "urn:ex/vav-529-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-temp",
+        "@id": "urn:ex/vav-507-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/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-520-more-heat-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/zone-110-cooling-setpoint",
+        "@id": "urn:ex/zone-104-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -22845,69 +22436,45 @@
         ]
     },
     {
-        "@id": "urn:ex/room-213-hvac-domain",
+        "@id": "urn:ex/office-ahu-chilled-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-213-in"
-            },
-            {
-                "@id": "urn:ex/room-213-out"
+                "@id": "urn:ex/office-ahu-chilled-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/zone-214",
+        "@id": "urn:ex/room-210-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-214-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/connection-to-room-210"
             }
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-214-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-102-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-102"
+                "@id": "urn:ex/connection-to-room-110"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22917,7 +22484,19 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-513-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/zone-203-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -22933,91 +22512,112 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-air-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/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/zone-211-occupancy-override",
+        "@id": "urn:ex/office-ahu-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-Override"
+                "@id": "urn:ex/office-ahu-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-window-switch-on-off",
+        "@id": "urn:ex/vav-509-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-OnOff"
+                "@id": "urn:ex/vav-509-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-509-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-more-heat-requests",
+        "@id": "urn:ex/vav-529-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-HVACOperatingMode"
+                "@id": "urn:ex/vav-529-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-colder-supply-air-requests",
+        "@id": "urn:ex/vav-540-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-517-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-528-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-528-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-528-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-temp",
+        "@id": "urn:ex/zone-314-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"
@@ -23030,7 +22630,7 @@
         ]
     },
     {
-        "@id": "urn:ex/room-112-out",
+        "@id": "urn:ex/room-118-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -23046,14 +22646,10 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-537-hot-water-out-connection",
         "@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#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -23062,371 +22658,400 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-539-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-539-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-temp",
+        "@id": "urn:ex/zone-116-117-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/vav-525-air-in",
+        "@id": "urn:ex/vav-517-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-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"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-305",
+        "@id": "urn:ex/vav-530-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-509-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-509-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-509-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-534-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-hot-water-out-connection"
+                "@id": "urn:ex/vav-534-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-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-flow",
+        "@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/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-512-reheat-coil-air-in",
+        "@id": "urn:ex/zone-112-114-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-512-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-502-damper",
+        "@id": "urn:ex/vav-521-damper-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-502-damper-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-502-damper-out"
+                "@id": "urn:ex/vav-521-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-502-damper-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-502-damper-position"
+                "@id": "urn:ex/vav-521-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-occupancy",
+        "@id": "urn:ex/vav-505-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/vav-502-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-519-hot-water-in-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/vav-515-damper",
+        "@id": "urn:ex/vav-506-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-515-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-damper-out"
+                "@id": "urn:ex/vav-506-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-damper-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-526-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-515-damper-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-118",
+        "@id": "urn:ex/office-ahu-oa-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#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/office-ahu-oa-flow"
+            },
+            {
+                "@id": "urn:ex/office-ahu-oa-temp"
+            }
         ]
     },
     {
-        "@id": "urn:ex/room-201",
+        "@id": "urn:ex/vav-530-reheat-coil-valve-command",
         "@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-201-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-525-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-115-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-525-air-out"
+                "@id": "urn:ex/room-115-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-525-discharge-air-temp"
+                "@id": "urn:ex/zone-115-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304",
+        "@id": "urn:ex/vav-527-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-304-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-air-in",
+        "@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-Override"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-reheat-coil-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-515-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-515-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-temp-setpoint",
+        "@id": "urn:ex/vav-539-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/Temperature"
+                "@id": "urn:ex/vav-539-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"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-command",
+        "@id": "urn:ex/room-107-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-106-107"
             }
         ],
-        "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-519-discharge-air-flow",
+        "@id": "urn:ex/vav-528-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/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-203",
+        "@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-203-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-position",
+        "@id": "urn:ex/vav-539-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/zone-102-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-102-hvac-domain"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-102-occupancy"
+                "@id": "urn:ex/zone-202-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-water-out",
+        "@id": "urn:ex/vav-516-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-534-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-516-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23436,73 +23061,74 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525",
+        "@id": "urn:ex/vav-533-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-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"
+                "@id": "urn:ex/vav-533-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-525-damper"
-            },
-            {
-                "@id": "urn:ex/vav-525-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-flow-sensor",
+        "@id": "urn:ex/office-ahu-oa-damper-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-508-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-508-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-540-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-534-air-in"
+                "@id": "urn:ex/vav-540-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-540-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-command",
+        "@id": "urn:ex/connection-to-room-115",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "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-533-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -23516,210 +23142,250 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-air-out",
+        "@id": "urn:ex/vav-532-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/connection-to-room-214"
+                "@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-510-discharge-air-temp-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-539-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-539-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-539-air-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112",
+        "@id": "urn:ex/office-ahu-oa-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/room-112-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
+            }
+        ],
+        "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-513-reheat-coil-water-out",
+        "@id": "urn:ex/connection-to-room-301",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-513-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-514-colder-supply-air-requests",
+        "@id": "urn:ex/zone-211-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-537-discharge-air-flow-sensor",
+        "@id": "urn:ex/office-ahu-sa-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-537-air-in"
+                "@id": "urn:ex/office-ahu-sa-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-flow"
+                "@id": "urn:ex/office-ahu-sa-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-air-out",
+        "@id": "urn:ex/vav-539-hot-water-in-connection",
         "@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-105"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-more-heat-requests",
+        "@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-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-518-discharge-air-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-504-heating-pid-output"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-504-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-air-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118",
+        "@id": "urn:ex/zone-305-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-118-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-530-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-118-cooling-setpoint"
-            },
+                "@id": "urn:ex/connection-to-room-303-304-306"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-118-heating-setpoint"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-118-occupancy"
+                "@id": "urn:ex/vav-530-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/zone-118-occupancy-override"
+                "@id": "urn:ex/vav-530-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/zone-118-temp"
+                "@id": "urn:ex/vav-530-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/zone-118-window-switch-on-off"
+                "@id": "urn:ex/vav-530-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-flow",
+        "@id": "urn:ex/vav-530-colder-supply-air-requests",
         "@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#EnumeratedObservableProperty"
         ],
-        "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-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-108",
+        "@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/zone-215-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/zone-101-cooling-setpoint",
+        "@id": "urn:ex/vav-511-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/office-ahu-ea-damper-in",
+        "@id": "urn:ex/room-116-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/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23729,106 +23395,125 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-in",
+        "@id": "urn:ex/vav-511-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-511-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-533-air-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-105",
+        "@id": "urn:ex/zone-102-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/room-301-out",
+        "@id": "urn:ex/vav-513-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/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-512-damper-actuator",
+        "@id": "urn:ex/vav-507-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-512-damper"
+                "@id": "urn:ex/vav-507-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-512-damper-command"
+                "@id": "urn:ex/vav-507-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-hot-water-out",
+        "@id": "urn:ex/room-311",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-311-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-201-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/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-516-hot-water-out-connection",
+        "@id": "urn:ex/vav-524-heating-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-529-air-out",
+        "@id": "urn:ex/vav-537-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-303-304-306"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23836,63 +23521,53 @@
                 "@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"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-529-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-537-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-in",
+        "@id": "urn:ex/vav-539-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator"
+                "@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/office-ahu-oa-flow"
-            },
-            {
-                "@id": "urn:ex/office-ahu-oa-temp"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-heating-setpoint",
+        "@id": "urn:ex/connection-to-room-101",
         "@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/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-201-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-523-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-504-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -23908,72 +23583,80 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-colder-supply-air-requests",
+        "@id": "urn:ex/vav-506-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-111-temp",
+        "@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/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-540-more-heat-requests",
+        "@id": "urn:ex/vav-501-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-102"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-303-304-306-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#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-501-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-501-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-501-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-window-switch-on-off",
+        "@id": "urn:ex/vav-533-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-501-heating-pid-output",
+        "@id": "urn:ex/vav-504-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -23989,169 +23672,178 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-in",
+        "@id": "urn:ex/vav-514-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-515-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-115"
             }
         ],
         "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-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-523-hot-water-out",
+        "@id": "urn:ex/vav-501-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-523-hot-water-out-connection"
+                "@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#Medium-Water"
+                "@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-535-more-heat-requests",
+        "@id": "urn:ex/zone-301-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-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/zone-213-window-switch-on-off",
+        "@id": "urn:ex/connection-to-room-207",
         "@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-534-damper-in",
+        "@id": "urn:ex/vav-503-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-503-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-534-air-in"
-            }
-        ]
-    },
-    {
-        "@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/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-503-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301",
+        "@id": "urn:ex/vav-539-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": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-301-hvac-domain"
+                "@id": "urn:ex/connection-to-room-214"
             }
         ],
-        "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/zone-301-occupancy-override"
+                "@id": "urn:ex/vav-539-heating-pid-output"
             },
             {
-                "@id": "urn:ex/zone-301-temp"
-            },
+                "@id": "urn:ex/vav-539-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-301-window-switch-on-off"
+                "@id": "urn:ex/vav-539-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-window-switch-on-off",
+        "@id": "urn:ex/vav-508-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-508-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-508-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-307-308-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#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/zone-213",
+        "@id": "urn:ex/zone-105",
         "@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-213-hvac-domain"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -24161,189 +23853,195 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-213-cooling-setpoint"
+                "@id": "urn:ex/zone-105-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-213-heating-setpoint"
+                "@id": "urn:ex/zone-105-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-213-occupancy"
+                "@id": "urn:ex/zone-105-occupancy"
             },
             {
-                "@id": "urn:ex/zone-213-occupancy-override"
+                "@id": "urn:ex/zone-105-occupancy-override"
             },
             {
-                "@id": "urn:ex/zone-213-temp"
+                "@id": "urn:ex/zone-105-temp"
             },
             {
-                "@id": "urn:ex/zone-213-window-switch-on-off"
+                "@id": "urn:ex/zone-105-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-command",
+        "@id": "urn:ex/room-118-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-118"
             }
         ],
-        "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-510-reheat-coil-valve-command",
+        "@id": "urn:ex/office-ahu-ma-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "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/zone-211-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-damper-in",
+        "@id": "urn:ex/vav-520-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-520-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-506-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-515-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-518-reheat-coil-valve-actuator",
+        "@id": "urn:ex/office-ahu-sa-fan-start-status",
         "@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-518-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-208-209",
+        "@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/vav-518-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-command",
+        "@id": "urn:ex/vav-511-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-511-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-511-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-201-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-524-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-514-air-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/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/vav-525-damper",
+        "@id": "urn:ex/vav-515-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-525-damper-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-525-damper-out"
+                "@id": "urn:ex/vav-515-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-525-damper-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-525-damper-position"
+                "@id": "urn:ex/vav-515-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-air-out",
+        "@id": "urn:ex/vav-506-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-212"
+                "@id": "urn:ex/connection-to-room-106-107"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24353,38 +24051,58 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-flow"
+                "@id": "urn:ex/vav-506-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-526-discharge-air-flow-setpoint"
-            },
+                "@id": "urn:ex/vav-506-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-506-air-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-heating-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-107",
+        "@id": "urn:ex/zone-201-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-107-hvac-domain"
+                "@id": "urn:ex/room-201-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-201-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-water-in",
+        "@id": "urn:ex/vav-526-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-hot-water-in-connection"
+                "@id": "urn:ex/vav-526-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24394,57 +24112,65 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-523-hot-water-in"
+                "@id": "urn:ex/vav-526-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-air-out",
+        "@id": "urn:ex/zone-109",
         "@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-203"
+                "@id": "urn:ex/room-109-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-517-heating-pid-output"
+                "@id": "urn:ex/zone-109-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-517-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/zone-109-heating-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-517-air-out"
+                "@id": "urn:ex/zone-109-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-109-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-109-temp"
+            },
+            {
+                "@id": "urn:ex/zone-109-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-position",
+        "@id": "urn:ex/vav-537-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-537-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-537-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-529-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24460,83 +24186,30 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper-in",
+        "@id": "urn:ex/office-ahu-air-filter-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-air-filter"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-519-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-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_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-damper-out",
+        "@id": "urn:ex/room-211-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-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-527-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-527-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/office-ahu-connection-from-rooms"
             }
-        ]
-    },
-    {
-        "@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": [
             {
@@ -24545,36 +24218,24 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-110-occupancy",
+        "@id": "urn:ex/zone-104-occupancy-override",
         "@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-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": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-118-out",
+        "@id": "urn:ex/vav-514-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": [
@@ -24584,28 +24245,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-water-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-506-hot-water-in-connection"
+                "@id": "urn:ex/vav-522-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-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-206",
+        "@id": "urn:ex/vav-538-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -24617,76 +24273,49 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-cooling-setpoint",
+        "@id": "urn:ex/vav-537-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-537-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@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#cnx": [
-            {
-                "@id": "urn:ex/vav-515-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-515-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-515-damper"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve"
+                "@id": "urn:ex/vav-537-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-in",
+        "@id": "urn:ex/vav-509-reheat-coil-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-509-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-516-air-in"
+                "@id": "urn:ex/vav-509-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-520-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -24702,185 +24331,133 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil",
+        "@id": "urn:ex/vav-536-hot-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-525-reheat-coil-air-in"
-            },
-            {
-                "@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"
+                "@id": "urn:ex/vav-536-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"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-actuator",
+        "@id": "urn:ex/vav-526-discharge-air-flow-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-536-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-536-damper-command"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-chilled-water-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/office-ahu-chilled-water-in-connection"
+                "@id": "urn:ex/connection-to-room-115"
             }
         ],
         "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-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve"
+                "@id": "urn:ex/vav-514-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-514-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-514-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-flow",
+        "@id": "urn:ex/vav-502-discharge-air-flow-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-502-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-502-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-water-out",
+        "@id": "urn:ex/vav-522-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-530-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-505-reheat-coil-air-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/connection-to-room-108"
+                "@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/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/zone-215-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-527-discharge-air-temp",
+        "@id": "urn:ex/vav-539-cooling-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/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-531-damper-in",
+        "@id": "urn:ex/vav-538-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-538-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24888,57 +24465,60 @@
                 "@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-air-in"
+                "@id": "urn:ex/vav-538-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-538-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518",
+        "@id": "urn:ex/vav-503",
         "@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-518-air-in"
+                "@id": "urn:ex/vav-503-air-in"
             },
             {
-                "@id": "urn:ex/vav-518-air-out"
+                "@id": "urn:ex/vav-503-air-out"
             },
             {
-                "@id": "urn:ex/vav-518-hot-water-in"
+                "@id": "urn:ex/vav-503-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-518-hot-water-out"
+                "@id": "urn:ex/vav-503-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-518-damper"
+                "@id": "urn:ex/vav-503-damper"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil"
+                "@id": "urn:ex/vav-503-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve"
+                "@id": "urn:ex/vav-503-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-more-heat-requests",
+        "@id": "urn:ex/zone-110-window-switch-on-off",
         "@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-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -24954,484 +24534,416 @@
         ]
     },
     {
-        "@id": "urn:ex/room-102",
+        "@id": "urn:ex/vav-523-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-102-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve",
+        "@id": "urn:ex/vav-501-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-508-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-508-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-501-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-501-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-water-in",
+        "@id": "urn:ex/vav-511-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-514-hot-water-in-connection"
+                "@id": "urn:ex/vav-511-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-514-hot-water-in"
+                "@id": "urn:ex/vav-511-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-511-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-air-out",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-position",
         "@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#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-503-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-503-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-503-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-503-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-519-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-511-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/zone-111-window-switch-on-off",
+        "@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-OnOff"
+                "@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-reheat-coil-air-out",
+        "@id": "urn:ex/room-109-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-303-304-306"
+                "@id": "urn:ex/connection-to-room-109"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-516-cooling-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "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/Dimensionless"
             }
         ],
-        "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/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-out",
+        "@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-524-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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-524-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-524-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-occupancy-override",
+        "@id": "urn:ex/vav-502-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-Override"
+                "@id": "urn:ex/vav-502-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-115-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/connection-to-room-109",
+        "@id": "urn:ex/vav-539-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-539-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-103-occupancy-sensor",
+        "@id": "urn:ex/vav-535-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-103-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-103-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-water-out",
+        "@id": "urn:ex/room-202-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-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-202"
             }
         ],
         "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-303-304-306",
+        "@id": "urn:ex/vav-540",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-303-hvac-domain"
+                "@id": "urn:ex/vav-540-air-in"
             },
             {
-                "@id": "urn:ex/room-304-hvac-domain"
+                "@id": "urn:ex/vav-540-air-out"
             },
             {
-                "@id": "urn:ex/room-306-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+                "@id": "urn:ex/vav-540-hot-water-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-540-hot-water-out"
             }
         ],
-        "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/zone-303-304-306-occupancy"
-            },
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/zone-303-304-306-occupancy-override"
+                "@id": "urn:ex/vav-540-damper"
             },
             {
-                "@id": "urn:ex/zone-303-304-306-temp"
+                "@id": "urn:ex/vav-540-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-303-304-306-window-switch-on-off"
+                "@id": "urn:ex/vav-540-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-113-hvac-domain",
+        "@id": "urn:ex/zone-312-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-113-in"
-            },
-            {
-                "@id": "urn:ex/room-113-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-105",
+        "@id": "urn:ex/zone-104-occupancy-sensor",
         "@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-105-hvac-domain"
-            }
+            "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:ex/room-104-hvac-domain"
             }
         ],
-        "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"
-            },
-            {
-                "@id": "urn:ex/zone-105-temp"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-105-window-switch-on-off"
+                "@id": "urn:ex/zone-104-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538",
+        "@id": "urn:ex/vav-527",
         "@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-538-air-in"
+                "@id": "urn:ex/vav-527-air-in"
             },
             {
-                "@id": "urn:ex/vav-538-air-out"
+                "@id": "urn:ex/vav-527-air-out"
             },
             {
-                "@id": "urn:ex/vav-538-hot-water-in"
+                "@id": "urn:ex/vav-527-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-538-hot-water-out"
+                "@id": "urn:ex/vav-527-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-538-damper"
+                "@id": "urn:ex/vav-527-damper"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil"
+                "@id": "urn:ex/vav-527-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-528-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-527-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-out",
+        "@id": "urn:ex/zone-307-308-cooling-setpoint",
         "@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#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-536-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-536-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-air-in",
+        "@id": "urn:ex/zone-116-117-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-508-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-522-reheat-coil-water-in",
+        "@id": "urn:ex/vav-515-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-522-hot-water-in-connection"
+                "@id": "urn:ex/vav-515-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-522-hot-water-in"
+                "@id": "urn:ex/vav-515-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-515-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-occupancy",
+        "@id": "urn:ex/office-ahu-clg-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-Occupancy"
+                "@id": "urn:ex/office-ahu-duct-after-clg-coil"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-109-in",
+        "@id": "urn:ex/zone-206-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/connection-to-room-109"
+                "@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-538-reheat-coil-water-in",
+        "@id": "urn:ex/vav-525-reheat-coil-water-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/vav-525-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -25441,14 +24953,19 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-538-hot-water-in"
+                "@id": "urn:ex/vav-525-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-heating-setpoint",
+        "@id": "urn:ex/vav-529-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": [
             {
@@ -25462,51 +24979,25 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-colder-supply-air-requests",
+        "@id": "urn:ex/zone-303-304-306-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-512-air-out",
+        "@id": "urn:ex/vav-538-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-118"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "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"
-            },
-            {
-                "@id": "urn:ex/vav-512-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-538-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -25515,96 +25006,97 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-113-temp-sensor",
+        "@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/room-113-hvac-domain"
+                "@id": "urn:ex/vav-523-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-113-temp"
+                "@id": "urn:ex/vav-523-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-514-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-503-air-out"
+                "@id": "urn:ex/vav-514-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-503-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-air-out",
+        "@id": "urn:ex/vav-513-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/connection-to-room-309-310"
-            }
-        ],
-        "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-discharge-air-flow"
+                "@id": "urn:ex/vav-513-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-532-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-513-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-532-discharge-air-temp"
+                "@id": "urn:ex/vav-513-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-532-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-513-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110-out",
+        "@id": "urn:ex/vav-527-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-524-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-105-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-524-reheat-coil-valve"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
+                "@id": "urn:ex/zone-105-temp"
             }
         ]
     },
@@ -25620,368 +25112,306 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil",
+        "@id": "urn:ex/zone-108-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-507-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-507-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-507-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-507-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-522-damper-position",
+        "@id": "urn:ex/zone-313-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-527-reheat-coil",
+        "@id": "urn:ex/vav-515-heating-pid-output",
         "@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/Dimensionless"
             }
         ],
-        "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/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-air-in",
+        "@id": "urn:ex/room-202-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-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-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-window-switch-on-off",
+        "@id": "urn:ex/zone-102-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-OnOff"
+                "@id": "urn:ex/room-102-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-309-310-occupancy",
-        "@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-Occupancy"
+                "@id": "urn:ex/zone-102-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-flow",
+        "@id": "urn:ex/vav-529-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
-            }
-        ],
         "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-522-damper",
+        "@id": "urn:ex/vav-530-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-522-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-522-damper-out"
+                "@id": "urn:ex/vav-530-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-522-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-522-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-water-in",
+        "@id": "urn:ex/zone-208-209-occupancy-sensor",
         "@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#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-208-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-hot-water-in"
+                "@id": "urn:ex/zone-208-209-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-water-in",
+        "@id": "urn:ex/zone-104",
         "@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-520-hot-water-in-connection"
+                "@id": "urn:ex/room-104-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-520-hot-water-in"
+                "@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"
+            },
+            {
+                "@id": "urn:ex/zone-104-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-in-connection",
+        "@id": "urn:ex/office-ahu-sa-fan-power",
         "@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/ElectricPower"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-307-308-window-switch-on-off",
-        "@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/W"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-105-in",
+        "@id": "urn:ex/vav-520-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-105"
+                "@id": "urn:ex/vav-520-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-520-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-actuator",
+        "@id": "urn:ex/vav-503-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-516-damper"
+                "@id": "urn:ex/vav-503-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-516-damper-command"
+                "@id": "urn:ex/vav-503-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-517-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/connection-to-room-207",
+        "@id": "urn:ex/room-206-in",
         "@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-536-reheat-coil-valve-command",
-        "@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-206"
             }
         ],
-        "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-109-occupancy-sensor",
+        "@id": "urn:ex/vav-533-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-109-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-109-occupancy"
+                "@id": "urn:ex/connection-to-room-305"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-526-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/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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper-command"
+                "@id": "urn:ex/vav-533-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/office-ahu-oa-damper-position"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/vav-533-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Economizer"
+                "@id": "urn:ex/vav-533-discharge-air-temp"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
+                "@id": "urn:ex/vav-533-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-occupancy-override",
+        "@id": "urn:ex/vav-505-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-505-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-505-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-temp",
+        "@id": "urn:ex/zone-312-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -25997,101 +25427,82 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-102-temp-sensor",
+        "@id": "urn:ex/vav-524-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/room-102-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/zone-102-temp"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@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/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-512-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-512-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-512-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-position",
+        "@id": "urn:ex/vav-518-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": "urn:ex/vav-512-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://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-510-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-523-air-out"
+                "@id": "urn:ex/vav-510-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-523-discharge-air-temp"
+                "@id": "urn:ex/vav-510-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-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-204-205"
+                "@id": "urn:ex/connection-to-room-208-209"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26101,70 +25512,58 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-521-heating-pid-output"
+                "@id": "urn:ex/vav-522-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-521-more-heat-requests"
+                "@id": "urn:ex/vav-522-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-521-air-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-512-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-522-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-water-in",
+        "@id": "urn:ex/vav-535-reheat-coil-valve-actuator",
         "@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#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-535-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-517-hot-water-in"
+                "@id": "urn:ex/vav-535-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-more-heat-requests",
+        "@id": "urn:ex/zone-204-205-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-523-reheat-coil-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-523-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-509-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26174,82 +25573,87 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-504-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-516-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-210-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-210-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-210-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-temp-sensor",
+        "@id": "urn:ex/zone-118",
         "@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-118-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-203-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-532-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-532-air-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/zone-118-cooling-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-532-discharge-air-temp"
+                "@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/room-306",
+        "@id": "urn:ex/vav-527-discharge-air-flow-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-306-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/office-ahu-chilled-water-out-connection",
+        "@id": "urn:ex/vav-503-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -26261,21 +25665,14 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-duct-after-damper",
+        "@id": "urn:ex/vav-540-discharge-air-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-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-311-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -26289,55 +25686,60 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-214-heating-setpoint",
+        "@id": "urn:ex/room-313-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-511-air-in",
+        "@id": "urn:ex/vav-534-reheat-coil-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-534-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-534-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-temp-sensor",
+        "@id": "urn:ex/vav-507-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-215-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-215-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-cooling-pid-output",
+        "@id": "urn:ex/vav-538-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -26353,125 +25755,132 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-512-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/zone-102-occupancy-override",
+        "@id": "urn:ex/zone-112-114-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-522-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-540-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-522-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-522-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-540-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-flow-setpoint",
+        "@id": "urn:ex/office-ahu-sa-fan-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-clg-coil"
             }
         ],
-        "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/office-ahu-sa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-207-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-516-air-out"
+                "@id": "urn:ex/room-207-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-516-discharge-air-temp"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-205",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:ex/room-205-hvac-domain"
+                "@id": "urn:ex/zone-207-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-out",
+        "@id": "urn:ex/vav-534-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-hot-water-out-connection"
+                "@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"
+            }
+        ],
+        "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/vav-519-reheat-coil-valve-command",
+        "@id": "urn:ex/room-310-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-526-air-in",
+        "@id": "urn:ex/vav-533-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -26487,286 +25896,224 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-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-522-pipe-hot-water-return-before-valve"
+                "@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/vav-502-damper-out",
+        "@id": "urn:ex/vav-528-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-502-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"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-502-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-502-cooling-pid-output"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-heating-pid-output",
+        "@id": "urn:ex/vav-504-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-504-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-504-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-air-out",
+        "@id": "urn:ex/vav-530-reheat-coil-valve-actuator",
         "@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#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-530-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-511-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-511-more-heat-requests"
+                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-118-occupancy",
+        "@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-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-511-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-504-hot-water-out-connection"
+                "@id": "urn:ex/vav-511-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-504-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-window-switch-on-off",
+        "@id": "urn:ex/vav-520-discharge-air-temp",
         "@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-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-532-hot-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-532-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/room-114",
+        "@id": "urn:ex/vav-538-reheat-coil-air-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-114-hvac-domain"
+                "@id": "urn:ex/connection-to-room-213"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-203",
-        "@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-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-104-hvac-domain"
+                "@id": "urn:ex/vav-538-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-538-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-104-occupancy"
+                "@id": "urn:ex/vav-538-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-temp",
+        "@id": "urn:ex/vav-530-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/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-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-517-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-529-reheat-coil-valve",
+        "@id": "urn:ex/vav-528-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-529-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-302"
             }
         ],
         "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-529-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-528-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-sa-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:ex/vav-528-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/office-ahu-sa-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-528-discharge-air-temp"
+            },
             {
-                "@id": "urn:ex/office-ahu-sa-temp"
+                "@id": "urn:ex/vav-528-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-out",
+        "@id": "urn:ex/vav-511-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-duct-after-damper"
+                "@id": "urn:ex/vav-511-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-522-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-522-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-in",
+        "@id": "urn:ex/vav-513-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/office-ahu-pipe-chilled-water-return-before-valve"
+                "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26776,96 +26123,121 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-535-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-535-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-535-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-window-switch-on-off",
+        "@id": "urn:ex/zone-207-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-211-occupancy",
+        "@id": "urn:ex/zone-111-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-Occupancy"
+                "@id": "urn:ex/room-111-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-111-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-519-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://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-536-air-in"
+                "@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-512-cooling-pid-output",
+        "@id": "urn:ex/zone-102-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-502-reheat-coil-air-in",
+        "@id": "urn:ex/vav-520-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-502-duct-after-damper"
+                "@id": "urn:ex/vav-520-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-539-reheat-coil-valve-position",
+        "@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": [
             {
@@ -26879,139 +26251,148 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-213",
+        "@id": "urn:ex/vav-508-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-213-occupancy-sensor",
+        "@id": "urn:ex/vav-532-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-213-hvac-domain"
+                "@id": "urn:ex/vav-532-duct-after-damper"
             }
         ],
-        "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-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-538-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-302-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/room-212-in",
+        "@id": "urn:ex/vav-511",
         "@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/connection-to-room-212"
+                "@id": "urn:ex/vav-511-air-in"
+            },
+            {
+                "@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#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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-526-damper-command",
+        "@id": "urn:ex/vav-510-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/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-510-damper-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-510-damper-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-307",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-307-hvac-domain"
+                "@id": "urn:ex/vav-510-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-510-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-520-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-520-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-516-heating-pid-output",
+        "@id": "urn:ex/office-ahu-htg-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/office-ahu-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"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-509-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-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper-position",
+        "@id": "urn:ex/vav-517-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -27025,41 +26406,56 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-position",
+        "@id": "urn:ex/room-313-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-313"
             }
         ],
-        "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-531-duct-after-damper",
+        "@id": "urn:ex/vav-525-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-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-533-damper-out",
+        "@id": "urn:ex/room-111",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-111-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-sa-fan-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/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27067,72 +26463,115 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "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/office-ahu-sa-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve",
+        "@id": "urn:ex/room-104-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-in"
+                "@id": "urn:ex/room-104-in"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-out"
+                "@id": "urn:ex/room-104-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-206"
             }
         ],
         "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-538-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-523-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-523-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-523-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-523-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-occupancy-sensor",
+        "@id": "urn:ex/zone-207-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/room-207-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-110-occupancy"
+                "@id": "urn:ex/zone-207-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-window-switch-on-off",
+        "@id": "urn:ex/vav-514-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-512-heating-pid-output",
+        "@id": "urn:ex/connection-to-room-204-205",
+        "@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-523-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-505-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27148,52 +26587,59 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper",
+        "@id": "urn:ex/room-209-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-514-damper-in"
+                "@id": "urn:ex/room-209-in"
             },
             {
-                "@id": "urn:ex/vav-514-damper-out"
+                "@id": "urn:ex/room-209-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-514-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-514-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-actuator",
+        "@id": "urn:ex/vav-534-discharge-air-flow-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-504-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-damper-command"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-temp",
+        "@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-537-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
@@ -27208,46 +26654,42 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-flow-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/vav-513-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-513-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-position",
+        "@id": "urn:ex/room-212-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-529-hot-water-in",
+        "@id": "urn:ex/vav-515-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-529-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27256,7 +26698,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-position",
+        "@id": "urn:ex/vav-530-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27272,119 +26714,145 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-hot-water-in",
+        "@id": "urn:ex/zone-118-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-533-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-531-damper-actuator",
+        "@id": "urn:ex/office-ahu-chilled-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-531-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-531-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-temp-sensor",
+        "@id": "urn:ex/room-308-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-501-air-out"
+                "@id": "urn:ex/connection-to-room-307-308"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "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-535-damper-actuator",
+        "@id": "urn:ex/vav-512-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-damper"
+                "@id": "urn:ex/vav-512-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-512-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-damper-command"
+                "@id": "urn:ex/vav-512-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-512-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-out",
+        "@id": "urn:ex/vav-508-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-duct-after-damper"
+                "@id": "urn:ex/vav-508-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-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-colder-supply-air-requests"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-537-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-temp",
+        "@id": "urn:ex/vav-509-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/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-reheat-coil-air-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-532-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-513-hot-water-out-connection",
+        "@id": "urn:ex/vav-507-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#cnx": [
+            {
+                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27393,13 +26861,13 @@
         ]
     },
     {
-        "@id": "urn:ex/room-312-out",
+        "@id": "urn:ex/vav-517-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-connection-from-rooms"
+                "@id": "urn:ex/vav-517-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27409,7 +26877,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -27421,138 +26889,134 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-heating-setpoint",
+        "@id": "urn:ex/vav-521-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/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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-521-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501",
+        "@id": "urn:ex/vav-520-reheat-coil-air-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-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"
+                "@id": "urn:ex/vav-520-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-501-damper"
-            },
-            {
-                "@id": "urn:ex/vav-501-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-water-out",
+        "@id": "urn:ex/vav-534-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-510-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/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-115-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/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-out-connection",
+        "@id": "urn:ex/vav-509-damper-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-509-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-118-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-527-reheat-coil-valve",
+        "@id": "urn:ex/vav-505-reheat-coil-water-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-527-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve"
             }
         ],
         "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/vav-521-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/vav-527-reheat-coil-valve-command"
-            },
+                "@id": "urn:ex/vav-521-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-521-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-position",
+        "@id": "urn:ex/vav-539-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27568,24 +27032,13 @@
         ]
     },
     {
-        "@id": "urn:ex/room-214",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:ex/room-214-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-oa-temp",
+        "@id": "urn:ex/vav-509-discharge-air-temp",
         "@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": [
@@ -27600,13 +27053,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-in",
+        "@id": "urn:ex/vav-531-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-307-308"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27614,120 +27067,144 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-531-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-531-more-heat-requests"
+            }
+        ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-539-air-in"
+                "@id": "urn:ex/vav-531-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-window-switch-on-off",
+        "@id": "urn:ex/vav-517-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-507-reheat-coil-air-in",
+        "@id": "urn:ex/vav-505-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-507-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/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-out-connection",
+        "@id": "urn:ex/room-301-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-301-in"
+            },
+            {
+                "@id": "urn:ex/room-301-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-air-out",
+        "@id": "urn:ex/zone-101-co2-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-201"
+                "@id": "urn:ex/room-101-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-101-co2-concentration"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-516-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-more-heat-requests"
+                "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-516-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-position",
+        "@id": "urn:ex/vav-506-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-506-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-506-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-cooling-pid-output",
+        "@id": "urn:ex/zone-302-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-302-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-302-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-in",
+        "@id": "urn:ex/vav-524-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-524-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27735,98 +27212,91 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-523-air-in"
+                "@id": "urn:ex/vav-524-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-524-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114",
+        "@id": "urn:ex/vav-532-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-112-hvac-domain"
-            },
-            {
-                "@id": "urn:ex/room-114-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/office-ahu-connection-to-vavs"
             }
         ],
-        "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-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-hot-water-out-connection",
+        "@id": "urn:ex/room-212-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-212"
+            }
         ],
         "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-heating-pid-output",
+        "@id": "urn:ex/vav-527-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/Dimensionless"
+                "@id": "urn:ex/vav-527-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-527-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-527-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-527-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-command",
+        "@id": "urn:ex/room-103-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-103-in"
+            },
+            {
+                "@id": "urn:ex/room-103-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/vav-511-heating-pid-output",
+        "@id": "urn:ex/vav-517-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27842,248 +27312,265 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-more-heat-requests",
+        "@id": "urn:ex/connection-to-room-309-310",
         "@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-507-hot-water-out-connection",
+        "@id": "urn:ex/room-212",
         "@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-212-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-actuator",
+        "@id": "urn:ex/vav-523-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-538-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-538-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-523-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-temp",
+        "@id": "urn:ex/vav-512-discharge-air-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-Supply"
+                "@id": "urn:ex/vav-512-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-512-discharge-air-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/vav-532-more-heat-requests",
+        "@id": "urn:ex/vav-534-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-501-reheat-coil-water-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/vav-501-hot-water-in-connection"
+                "@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-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-501-hot-water-in"
+                "@id": "urn:ex/vav-514-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-514-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-sensor",
+        "@id": "urn:ex/zone-103-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/office-ahu-sa-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521",
+        "@id": "urn:ex/vav-508-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-521-air-in"
+                "@id": "urn:ex/vav-508-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-521-air-out"
+                "@id": "urn:ex/vav-508-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-521-hot-water-in"
+                "@id": "urn:ex/vav-508-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-521-hot-water-out"
+                "@id": "urn:ex/vav-508-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-521-damper"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-more-heat-requests",
+        "@id": "urn:ex/vav-529-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-529-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-529-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205",
+        "@id": "urn:ex/vav-517-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": [
-            {
-                "@id": "urn:ex/room-204-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-205-hvac-domain"
+                "@id": "urn:ex/vav-517-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-204-205-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-204-205-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-204-205-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-204-205-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-204-205-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-204-205-window-switch-on-off"
+                "@id": "urn:ex/vav-517-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-517-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-521-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-521-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-in-connection",
+        "@id": "urn:ex/vav-512-discharge-air-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://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/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-523-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/VolumeFlowRate"
+                "@id": "urn:ex/vav-523-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-523-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-out",
+        "@id": "urn:ex/vav-537-air-out",
         "@type": [
             "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-312"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28093,95 +27580,77 @@
         ],
         "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/vav-537-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
+                "@id": "urn:ex/vav-537-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/office-ahu-supply-duct-static-pressure-setpoint"
+                "@id": "urn:ex/vav-537-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/office-ahu-warmer-supply-air-requests"
+                "@id": "urn:ex/vav-537-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-in",
+        "@id": "urn:ex/zone-309-310-cooling-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#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#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-507-air-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil",
+        "@id": "urn:ex/vav-516-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-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-516-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-516-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-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"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-out",
+        "@id": "urn:ex/vav-526-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-510-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -28190,48 +27659,48 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper",
+        "@id": "urn:ex/room-310-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-523-damper-in"
+                "@id": "urn:ex/room-310-in"
             },
             {
-                "@id": "urn:ex/vav-523-damper-out"
+                "@id": "urn:ex/room-310-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-523-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-523-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-hot-water-out-connection",
+        "@id": "urn:ex/vav-520-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/room-113-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/connection-to-room-113"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28241,76 +27710,74 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-air-in",
+        "@id": "urn:ex/zone-312-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-504-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-533-damper-position",
+        "@id": "urn:ex/vav-539-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-507-reheat-coil-water-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/vav-507-pipe-hot-water-return-before-valve"
+                "@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-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-water-in",
+        "@id": "urn:ex/vav-501-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-540-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-540-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-air-in",
+        "@id": "urn:ex/vav-510-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -28323,54 +27790,79 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-517-more-heat-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/vav-510-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-204-205",
         "@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/vav-513-air-out"
+                "@id": "urn:ex/room-204-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-205-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-513-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-204-205-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-204-205-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-204-205-occupancy"
+            },
+            {
+                "@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/zone-201-occupancy-override",
+        "@id": "http://data.ashrae.org/standard223#Role-Outside",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumerationKind-Role"
+        ]
+    },
+    {
+        "@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#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-523-reheat-coil-air-out",
+        "@id": "urn:ex/vav-504-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-206"
+                "@id": "urn:ex/connection-to-room-105"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28380,27 +27872,24 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-523-heating-pid-output"
+                "@id": "urn:ex/vav-504-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-523-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-504-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-523-air-out"
+                "@id": "urn:ex/vav-504-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-504-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-in",
+        "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -28409,175 +27898,205 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-more-heat-requests",
+        "@id": "urn:ex/vav-507-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-504-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-509-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-501-damper-out",
+        "@id": "urn:ex/vav-518-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-501-duct-after-damper"
+                "@id": "urn:ex/vav-518-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-521-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-501-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535",
+        "@id": "urn:ex/vav-530-heating-pid-output",
         "@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-535-air-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-535-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-535-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-535-damper"
-            },
-            {
-                "@id": "urn:ex/vav-535-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil",
+        "@id": "urn:ex/room-106-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/office-ahu-htg-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-htg-coil-air-out"
-            },
+                "@id": "urn:ex/connection-to-room-106-107"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-534-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-water-out"
+                "@id": "urn:ex/vav-534-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"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-temp-sensor",
+        "@id": "urn:ex/vav-529-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-116-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-116-117-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-occupancy",
+        "@id": "urn:ex/vav-525-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-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-521-damper-actuator",
+        "@id": "urn:ex/vav-520-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-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#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/office-ahu-ra-temp-sensor",
+        "@id": "urn:ex/vav-507-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/office-ahu-ra-in"
+                "@id": "urn:ex/vav-507-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-ra-temp"
+                "@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-519-damper-command",
+        "@id": "urn:ex/connection-to-room-312",
+        "@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-513-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -28593,167 +28112,185 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-517-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-517-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-occupancy-sensor",
+        "@id": "urn:ex/zone-102-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-116-hvac-domain"
+                "@id": "urn:ex/room-102-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-116-117-occupancy"
+                "@id": "urn:ex/zone-102-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-203-in",
+        "@id": "urn:ex/vav-522-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-203"
+                "@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-522-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-518-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"
+                "@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-512-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-509-reheat-coil-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/DimensionlessRatio"
+                "@id": "urn:ex/connection-to-room-113"
             }
         ],
-        "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-518-discharge-air-flow",
-        "@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/vav-509-heating-pid-output"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-509-more-heat-requests"
             }
         ],
-        "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-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-occupancy-override",
+        "@id": "urn:ex/vav-532-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-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-215",
+        "@id": "urn:ex/vav-521-damper-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-215-hvac-domain"
+                "@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-521-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-521-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-moisture-eliminator",
+        "@id": "urn:ex/vav-512-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#AirFilter",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
+            "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-moisture-eliminator-in"
+                "@id": "urn:ex/vav-512-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/office-ahu-moisture-eliminator-out"
+                "@id": "urn:ex/vav-512-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-512-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-512-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-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-531-pipe-hot-water-return-before-valve"
+                "@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-Water"
+                "@id": "urn:ex/vav-504-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-ra-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-Return"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
@@ -28768,13 +28305,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-hot-water-out",
+        "@id": "urn:ex/vav-517-damper-in",
+        "@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#mapsTo": [
+            {
+                "@id": "urn:ex/vav-517-air-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-hot-water-out-connection"
+                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28784,51 +28342,75 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-534-duct-after-damper",
+        "@id": "urn:ex/vav-528-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-312",
+        "@id": "urn:ex/room-204",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-312-hvac-domain"
+                "@id": "urn:ex/room-204-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-flow",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-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/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-521-reheat-coil-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@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#hasProperty": [
+            {
+                "@id": "urn:ex/vav-521-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-521-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-521-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-position",
+        "@id": "urn:ex/vav-512-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -28844,7 +28426,42 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-temp-setpoint",
+        "@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": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-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-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-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -28860,50 +28477,60 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-colder-supply-air-requests",
+        "@id": "urn:ex/office-ahu-chilled-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/office-ahu-chilled-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper",
+        "@id": "urn:ex/zone-202-heating-setpoint",
         "@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/vav-537-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "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-505-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-537-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-310-hvac-domain",
+        "@id": "urn:ex/room-201-hvac-domain",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-310-in"
+                "@id": "urn:ex/room-201-in"
             },
             {
-                "@id": "urn:ex/room-310-out"
+                "@id": "urn:ex/room-201-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -28913,34 +28540,51 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-513-reheat-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://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-513-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-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"
+            }
+        ],
+        "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/vav-505-colder-supply-air-requests",
+        "@id": "urn:ex/vav-532-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-532-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-532-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-out-connection",
+        "@id": "urn:ex/vav-504-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -28952,115 +28596,331 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-314",
+        "@id": "urn:ex/vav-524-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/room-314-hvac-domain"
+                "@id": "urn:ex/vav-524-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-524-damper-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-cooling-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/zone-314-cooling-setpoint"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu",
+        "@type": [
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-chilled-water-in"
             },
             {
-                "@id": "urn:ex/zone-314-heating-setpoint"
+                "@id": "urn:ex/office-ahu-chilled-water-out"
             },
             {
-                "@id": "urn:ex/zone-314-occupancy"
+                "@id": "urn:ex/office-ahu-ea-out"
             },
             {
-                "@id": "urn:ex/zone-314-occupancy-override"
+                "@id": "urn:ex/office-ahu-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-314-temp"
+                "@id": "urn:ex/office-ahu-hot-water-out"
             },
             {
-                "@id": "urn:ex/zone-314-window-switch-on-off"
+                "@id": "urn:ex/office-ahu-oa-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-sa-out"
+            }
+        ],
+        "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"
+            },
+            {
+                "@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-506-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-213-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-213"
             }
         ],
-        "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-valve-command",
+        "@id": "urn:ex/vav-522-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-522-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-522-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-522-cooling-pid-output"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-111-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-535-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/room-117-out",
+        "@id": "urn:ex/zone-109-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-from-rooms"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@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": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper",
+        "@id": "urn:ex/zone-213-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/office-ahu-htg-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-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-533-damper-in"
+                "@id": "urn:ex/vav-515-damper-in"
             },
             {
-                "@id": "urn:ex/vav-533-damper-out"
+                "@id": "urn:ex/vav-515-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-533-damper-command"
+                "@id": "urn:ex/vav-515-damper-command"
             },
             {
-                "@id": "urn:ex/vav-533-damper-position"
+                "@id": "urn:ex/vav-515-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-duct-after-damper",
+        "@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-539-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-539-hot-water-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505",
+        "@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-505-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-505-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-505-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@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-525-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-511-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-511-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-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -29072,74 +28932,150 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-air-in",
+        "@id": "urn:ex/room-304-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-511-duct-after-damper"
+                "@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-208-209",
+        "@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-208-hvac-domain"
+            },
+            {
+                "@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/zone-208-209-cooling-setpoint"
+            },
+            {
+                "@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-517-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-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-106",
+        "@id": "urn:ex/vav-508-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-106-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-heating-setpoint",
+        "@id": "urn:ex/vav-514-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/FT3-PER-MIN"
+            }
+        ]
+    },
+    {
+        "@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/connection-to-room-305"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@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-533-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-533-more-heat-requests"
             }
-        ]
-    },
-    {
-        "@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#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-533-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-103",
         "@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-103-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-temp",
+        "@id": "urn:ex/vav-512-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -29150,49 +29086,73 @@
         ],
         "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-502-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-504-reheat-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://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-504-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-504-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-525-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-508-air-out"
+                "@id": "urn:ex/vav-525-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-508-discharge-air-temp"
+                "@id": "urn:ex/vav-525-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-command",
+        "@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-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ra-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -29208,61 +29168,67 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-530-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-530-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/office-ahu-ea-damper-actuator",
+        "@id": "urn:ex/vav-520-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/office-ahu-ea-damper"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-ea-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-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-520-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-occupancy-override",
+        "@id": "urn:ex/vav-504-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-Override"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-312",
+        "@id": "urn:ex/vav-522-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -29274,7 +29240,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-flow",
+        "@id": "urn:ex/vav-517-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -29285,75 +29251,49 @@
         ],
         "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": "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-506-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-in",
+        "@id": "urn:ex/zone-106-107-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-531-hot-water-in-connection"
+                "@id": "urn:ex/room-106-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-106-107-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-air-in",
+        "@id": "urn:ex/vav-515-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-503-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-508-duct-after-damper",
+        "@id": "urn:ex/connection-to-room-212",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -29365,234 +29305,180 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-206-occupancy",
+        "@id": "urn:ex/vav-505-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-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-104",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/room-104-hvac-domain"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-hot-water-in",
+        "@id": "urn:ex/vav-510-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-hot-water-in-connection"
+                "@id": "urn:ex/vav-510-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-510-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311",
+        "@id": "urn:ex/zone-305-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-311-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-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-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-311-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-311-heating-setpoint"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-311-occupancy"
+                "@id": "urn:ex/vav-531-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/zone-311-occupancy-override"
+                "@id": "urn:ex/vav-531-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/zone-311-temp"
+                "@id": "urn:ex/vav-531-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/zone-311-window-switch-on-off"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-529-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-529-air-out"
+                "@id": "urn:ex/vav-531-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-529-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-air-in",
+        "@id": "urn:ex/vav-509-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/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-532-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-512-colder-supply-air-requests",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506",
+        "@id": "urn:ex/vav-516-heating-pid-output",
         "@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-506-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-506-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-506-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-506-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-506-damper"
-            },
-            {
-                "@id": "urn:ex/vav-506-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-water-out",
+        "@id": "urn:ex/zone-109-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-506-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-539-reheat-coil-valve",
+        "@id": "urn:ex/vav-507-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-539-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-110"
             }
         ],
         "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-539-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-507-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-507-more-heat-requests"
             }
-        ]
-    },
-    {
-        "@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": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-507-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-out",
+        "@id": "urn:ex/vav-510-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/vav-529-hot-water-out-connection"
+                "@id": "urn:ex/vav-510-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-510-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-cooling-pid-output",
+        "@id": "urn:ex/vav-520-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -29608,89 +29494,94 @@
         ]
     },
     {
-        "@id": "urn:ex/room-305",
+        "@id": "urn:ex/vav-502-damper-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-305-hvac-domain"
+                "@id": "urn:ex/vav-502-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-502-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan",
+        "@id": "urn:ex/zone-207-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-ra-fan-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "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"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-ra-fan-start-cmd"
-            },
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-discharge-air-temp-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-ra-fan-start-status"
+                "@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-Return"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-536-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/zone-305-temp-sensor",
+        "@id": "urn:ex/vav-511-reheat-coil-valve-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-305-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-305-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-511-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-position",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -29704,153 +29595,196 @@
         ]
     },
     {
-        "@id": "urn:ex/room-201-hvac-domain",
+        "@id": "urn:ex/room-116-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/connection-to-room-116-117"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-517-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-517-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/room-201-out"
+                "@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#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/zone-312",
+        "@id": "urn:ex/vav-527-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": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-312-hvac-domain"
+                "@id": "urn:ex/connection-to-room-301"
             }
         ],
-        "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-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/vav-527-heating-pid-output"
             },
             {
-                "@id": "urn:ex/zone-312-temp"
-            },
+                "@id": "urn:ex/vav-527-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-312-window-switch-on-off"
+                "@id": "urn:ex/vav-527-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-309-out",
+        "@id": "urn:ex/vav-518-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-518-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-518-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112-in",
+        "@id": "urn:ex/vav-510-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-112-114"
+                "@id": "urn:ex/vav-510-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-510-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115-in",
+        "@id": "urn:ex/vav-533-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/connection-to-room-115"
+                "@id": "urn:ex/vav-533-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-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-533-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-position",
+        "@id": "urn:ex/zone-213-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-533-reheat-coil",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-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-533-reheat-coil-air-in"
-            },
+                "@id": "urn:ex/vav-505-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-water-in"
-            },
+                "@id": "urn:ex/vav-505-hot-water-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-115-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-water-out"
+                "@id": "urn:ex/room-115-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/zone-115-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-duct-after-damper",
+        "@id": "urn:ex/connection-to-room-116-117",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -29862,123 +29796,129 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-207-temp",
+        "@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/Temperature"
+                "@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"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@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-511-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-515-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-515-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-513-damper",
+        "@id": "urn:ex/room-207-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-207-in"
             },
             {
-                "@id": "urn:ex/vav-513-damper-out"
+                "@id": "urn:ex/room-207-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/connection-to-room-103",
+        "@id": "urn:ex/vav-522-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-522-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-502-damper-command",
+        "@id": "urn:ex/vav-522-reheat-coil-water-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/vav-522-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-104-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-104-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-104-temp"
+                "@id": "urn:ex/vav-522-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-window-switch-on-off",
+        "@id": "urn:ex/vav-533-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-519-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-204-205"
+                "@id": "urn:ex/connection-to-room-313"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -29988,189 +29928,170 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-519-discharge-air-flow"
+                "@id": "urn:ex/vav-536-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-519-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-536-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-519-discharge-air-temp"
+                "@id": "urn:ex/vav-536-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-519-discharge-air-temp-setpoint"
-            }
-        ]
-    },
-    {
-        "@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/vav-536-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-508-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-527-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-508-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-508-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-527-hot-water-out"
+                "@id": "urn:ex/vav-508-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-508-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-colder-supply-air-requests",
+        "@id": "urn:ex/zone-103-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-509-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-513-reheat-coil-valve-command",
         "@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#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-509-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-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-511-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-511-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-window-switch-on-off",
+        "@id": "urn:ex/vav-538-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-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207-hvac-domain",
+        "@id": "urn:ex/zone-113-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-207-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-207-out"
+                "@id": "urn:ex/room-113-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/zone-113-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-209-hvac-domain",
+        "@id": "urn:ex/vav-530-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-209-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "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/vav-509",
+        "@id": "urn:ex/office-ahu-ra-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-509-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-509-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-509-hot-water-in"
+                "@id": "urn:ex/office-ahu-ra-damper-in"
             },
             {
-                "@id": "urn:ex/vav-509-hot-water-out"
+                "@id": "urn:ex/office-ahu-ra-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-509-damper"
+                "@id": "urn:ex/office-ahu-ra-damper-command"
             },
             {
-                "@id": "urn:ex/vav-509-reheat-coil"
-            },
+                "@id": "urn:ex/office-ahu-ra-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-position",
+        "@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": [
             {
@@ -30184,105 +30105,119 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-water-out",
+        "@id": "urn:ex/vav-504-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-105"
             }
         ],
         "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-more-heat-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-504-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-504-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-504-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-513-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-538-air-in"
+                "@id": "urn:ex/vav-513-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-flow"
+                "@id": "urn:ex/vav-513-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-cooling-pid-output",
+        "@id": "urn:ex/room-208",
         "@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-208-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-502-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-502-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-502-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-hot-water-out",
+        "@id": "urn:ex/vav-512-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-hot-water-out-connection"
+                "@id": "urn:ex/vav-512-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-512-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-206",
+        "@id": "urn:ex/vav-511-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-201",
         "@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"
+                "@id": "urn:ex/room-201-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -30292,81 +30227,38 @@
         ],
         "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-201-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-206-occupancy-override"
+                "@id": "urn:ex/zone-201-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-206-temp"
+                "@id": "urn:ex/zone-201-occupancy"
             },
             {
-                "@id": "urn:ex/zone-206-window-switch-on-off"
-            }
-        ]
-    },
-    {
-        "@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-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/zone-201-occupancy-override"
             },
             {
-                "@id": "urn:ex/vav-522-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-522-air-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-101-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-101-in"
+                "@id": "urn:ex/zone-201-temp"
             },
             {
-                "@id": "urn:ex/room-101-out"
+                "@id": "urn:ex/zone-201-window-switch-on-off"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-214-occupancy",
+        "@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-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-103-out",
+        "@id": "urn:ex/room-207-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -30382,59 +30274,52 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-air-out",
+        "@id": "urn:ex/vav-514-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-108"
+                "@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-505-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-505-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-505-discharge-air-temp"
-            },
-            {
-                "@id": "urn:ex/vav-505-discharge-air-temp-setpoint"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-cooling-setpoint",
+        "@id": "urn:ex/vav-511-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-511-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-511-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-511-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-511-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-air-out",
+        "@id": "urn:ex/vav-540-air-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/connection-to-room-215"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -30444,28 +30329,24 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-530-discharge-air-flow"
+                "@id": "urn:ex/vav-540-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-530-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-540-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-530-discharge-air-temp"
+                "@id": "urn:ex/vav-540-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-530-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-540-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-528-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -30474,123 +30355,119 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-507-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-528-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-528-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-531-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-539-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": [
             {
-                "@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-113-occupancy",
+        "@id": "urn:ex/vav-511-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-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-517-reheat-coil-valve",
+        "@id": "urn:ex/zone-203-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-517-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-517-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/room-203-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-517-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve-position"
+                "@id": "urn:ex/zone-203-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-window-switch-on-off",
+        "@id": "urn:ex/vav-511-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-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-529-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/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-command",
+        "@id": "urn:ex/room-115-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-115"
             }
         ],
-        "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-540-air-out",
+        "@id": "urn:ex/vav-522-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-208-209"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -30600,109 +30477,85 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-540-discharge-air-flow"
+                "@id": "urn:ex/vav-522-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-540-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-522-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-540-discharge-air-temp"
+                "@id": "urn:ex/vav-522-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-540-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-522-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-cooling-pid-output",
+        "@id": "urn:ex/vav-522-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/vav-506-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-525-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-525-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-540-damper-out",
+        "@id": "urn:ex/office-ahu-htg-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-duct-after-damper"
+                "@id": "urn:ex/office-ahu-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-540-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-540-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@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": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-occupancy-sensor",
+        "@id": "urn:ex/room-111-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-313-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-313-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-214-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -30718,400 +30571,340 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-actuator",
+        "@id": "urn:ex/vav-532-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-540-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-540-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-air-filter-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/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-534-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-heating-pid-output",
+        "@id": "urn:ex/vav-515-damper-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-309-310-occupancy-override",
+        "@id": "urn:ex/office-ahu-htg-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-106-107-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/office-ahu-htg-coil-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/office-ahu-htg-coil-air-out"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/office-ahu-htg-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-102-window-switch-on-off",
-        "@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-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-occupancy",
+        "@id": "urn:ex/zone-309-310-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": "urn:ex/vav-506-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"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-co2-sensor",
+        "@id": "urn:ex/vav-514-discharge-air-flow-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-514-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-206-co2-concentration"
+                "@id": "urn:ex/vav-514-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-111",
+        "@id": "urn:ex/vav-518-damper-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-111-hvac-domain"
+                "@id": "urn:ex/vav-518-duct-after-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-530-discharge-air-flow-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/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-518-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-518-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-214-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-512-colder-supply-air-requests",
+        "@id": "urn:ex/vav-526-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-526-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-519-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-309-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-310-hvac-domain"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
-        "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-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-519-heating-pid-output"
             },
             {
-                "@id": "urn:ex/zone-309-310-temp"
-            },
+                "@id": "urn:ex/vav-519-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-309-310-window-switch-on-off"
+                "@id": "urn:ex/vav-519-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-heating-pid-output",
+        "@id": "urn:ex/vav-527-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-527-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-527-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-527-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-501-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-311-occupancy-sensor",
+        "@id": "urn:ex/vav-527-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-311-hvac-domain"
+                "@id": "urn:ex/vav-527-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-311-occupancy"
+                "@id": "urn:ex/vav-527-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-hot-water-in",
+        "@id": "urn:ex/vav-526",
         "@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-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-526-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-118",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
+                "@id": "urn:ex/vav-526-air-out"
+            },
             {
-                "@id": "urn:ex/room-118-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@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-526-hot-water-in"
+            },
             {
-                "@id": "urn:ex/room-106-hvac-domain"
+                "@id": "urn:ex/vav-526-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-526-damper"
+            },
+            {
+                "@id": "urn:ex/vav-526-reheat-coil"
+            },
             {
-                "@id": "urn:ex/zone-106-107-occupancy"
+                "@id": "urn:ex/vav-526-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-heating-pid-output",
+        "@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/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-reheat-coil-valve-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-515-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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-515-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-540-damper-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-537-heating-pid-output"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-537-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-540-air-in"
+                "@id": "urn:ex/vav-537-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-211-occupancy-override",
         "@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/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-521-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/office-ahu-duct-after-moisture-eliminator",
+        "@id": "urn:ex/vav-504-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -31123,7 +30916,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-524-hot-water-out-connection",
+        "@id": "urn:ex/vav-522-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -31135,65 +30928,71 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil",
+        "@id": "urn:ex/zone-314-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-water-out"
+                "@id": "urn:ex/room-314-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/zone-314-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-air-in",
+        "@id": "urn:ex/vav-534",
         "@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-534-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-534-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-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-534-damper"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-cooling-pid-output",
+        "@id": "urn:ex/vav-537-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-516-discharge-air-flow",
+        "@id": "urn:ex/vav-536-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -31204,145 +31003,121 @@
         ],
         "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-528-air-out",
+        "@id": "urn:ex/room-302",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "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#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-528-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-528-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-528-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-528-discharge-air-temp-setpoint"
+                "@id": "urn:ex/room-302-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-water-in",
+        "@id": "urn:ex/vav-502-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-534-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/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-534-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-duct-after-damper",
+        "@id": "urn:ex/vav-513-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-506-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-531-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-506-air-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-531-reheat-coil-valve-in"
+            },
             {
-                "@id": "urn:ex/vav-506-discharge-air-flow"
+                "@id": "urn:ex/vav-531-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-102-cooling-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-531-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-531-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-more-heat-requests",
+        "@id": "urn:ex/room-203-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/office-ahu-connection-from-rooms"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-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/vav-526-hot-water-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-526-hot-water-in-connection"
+                "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -31352,164 +31127,162 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve",
+        "@id": "urn:ex/vav-529-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-506-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-529-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-529-reheat-coil-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-529-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-sa-fan-speed-status",
         "@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/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/office-ahu-htg-coil-water-in",
+        "@id": "urn:ex/vav-514-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-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-514-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-514-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-in"
+                "@id": "urn:ex/vav-514-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-514-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-hot-water-out",
+        "@id": "urn:ex/vav-529-air-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/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/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": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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/room-118-hvac-domain",
+        "@id": "urn:ex/vav-539-discharge-air-flow",
         "@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-118-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-118-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-530-damper-actuator",
+        "@id": "urn:ex/vav-526-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-530-damper"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-526-reheat-coil-valve-out"
             }
         ],
-        "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#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-526-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-526-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-526-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-509-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-513-colder-supply-air-requests",
+        "@id": "urn:ex/vav-537-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -31520,125 +31293,123 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-cooling-pid-output",
+        "@id": "urn:ex/vav-505-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-505-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-505-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-505-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-command",
+        "@id": "urn:ex/vav-540-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/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-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#cnx": [
-            {
-                "@id": "urn:ex/vav-537-duct-after-damper"
-            }
+            "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/vav-518-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-518-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-518-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-502-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-540-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-540-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-actuator",
+        "@id": "urn:ex/vav-503-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-510-damper"
+                "@id": "urn:ex/vav-503-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-510-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-531-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-522-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-522-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-in",
+        "@id": "urn:ex/vav-510-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-111"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -31646,30 +31417,39 @@
                 "@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-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-531-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-514-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-514-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-514-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-hot-water-in-connection",
+        "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -31679,48 +31459,48 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
-    },
-    {
-        "@id": "urn:ex/vav-515-damper-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-529-discharge-air-flow-setpoint",
+        "@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/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-515-air-in"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-hot-water-out",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-hot-water-out-connection"
+                "@id": "urn:ex/vav-518-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-518-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-503-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -31734,79 +31514,92 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-air-out",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-309-310"
+                "@id": "urn:ex/vav-507-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-532-heating-pid-output"
-            },
+                "@id": "urn:ex/vav-507-hot-water-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-307-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-more-heat-requests"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "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-538-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-506-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-508-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-526-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-508-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-526-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-508-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-air-out",
+        "@id": "urn:ex/vav-520-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-104"
+                "@id": "urn:ex/connection-to-room-207"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -31816,64 +31609,60 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-503-heating-pid-output"
+                "@id": "urn:ex/vav-520-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-503-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-520-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-503-air-out"
+                "@id": "urn:ex/vav-520-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-520-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-co2-concentration",
+        "@id": "urn:ex/vav-509-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-519-heating-pid-output",
+        "@id": "urn:ex/vav-538-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-538-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-520-discharge-air-temp",
+        "@id": "urn:ex/zone-105-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": [
             {
@@ -31887,56 +31676,51 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-colder-supply-air-requests",
+        "@id": "urn:ex/office-ahu-sa-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-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-in",
+        "@id": "urn:ex/vav-540-colder-supply-air-requests",
         "@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#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-504-hot-water-in",
+        "@id": "urn:ex/vav-509-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-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-512-damper-in",
+        "@id": "urn:ex/vav-503-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-104"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -31944,30 +31728,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-512-air-in"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-514-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
+                "@id": "urn:ex/vav-503-discharge-air-flow"
+            },
             {
-                "@id": "urn:ex/vav-514-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/vav-503-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-514-damper-command"
+                "@id": "urn:ex/vav-503-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-503-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-temp",
+        "@id": "urn:ex/vav-506-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -31978,41 +31755,24 @@
         ],
         "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-530-damper-in",
+        "@id": "urn:ex/vav-501-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"
-            }
-        ],
-        "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-501-hot-water-out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-525-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": [
             {
@@ -32021,9 +31781,9 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -32037,123 +31797,87 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-509",
         "@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/vav-502-air-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-509-air-in"
+            },
             {
-                "@id": "urn:ex/vav-502-discharge-air-flow"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-air-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/vav-509-air-out"
+            },
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-509-hot-water-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-509-hot-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-514-damper-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-509-damper"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-509-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-509-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-valve",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-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-523-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@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": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-heating-pid-output",
+        "@id": "urn:ex/zone-212-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-517-damper-out",
+        "@id": "urn:ex/vav-537-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-517-duct-after-damper"
+                "@id": "urn:ex/vav-537-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-517-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-517-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-in",
+        "@id": "urn:ex/vav-506-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -32169,12 +31893,12 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-510-air-in"
+                "@id": "urn:ex/vav-506-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-cooling-pid-output",
+        "@id": "urn:ex/vav-530-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -32190,46 +31914,37 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-523-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-514-air-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-514-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-538-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-511-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-511-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-520-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -32238,13 +31953,13 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-out",
+        "@id": "urn:ex/vav-521-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-ra-fan"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -32254,108 +31969,100 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-damper-position",
+        "@id": "urn:ex/vav-502-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-502-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-509-reheat-coil-water-out",
+        "@id": "urn:ex/vav-513-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-509-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/vav-502-damper-in",
+        "@id": "urn:ex/vav-523-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-523-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-502-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-air-out",
+        "@id": "urn:ex/zone-208-209-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-101"
-            }
-        ],
-        "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": [
-            {
-                "@id": "urn:ex/vav-502-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-502-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-104-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-502-air-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-204-205-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-524-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-524-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-hot-water-out-connection",
+        "@id": "urn:ex/vav-508-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-508-hot-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -32364,30 +32071,25 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-526-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-526-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-519-discharge-air-temp",
+        "@id": "urn:ex/vav-517-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": [
             {
@@ -32401,7 +32103,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-duct-after-damper",
+        "@id": "urn:ex/vav-514-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -32413,125 +32115,135 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-out",
+        "@id": "urn:ex/zone-116-117",
         "@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-510-duct-after-damper"
+                "@id": "urn:ex/room-116-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-117-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-510-colder-supply-air-requests"
+                "@id": "urn:ex/zone-116-117-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-510-cooling-pid-output"
+                "@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/zone-116-117-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-out-connection",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@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-oa-flow-sensor",
+        "@id": "urn:ex/zone-312-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper-in"
+                "@id": "urn:ex/room-312-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/office-ahu-oa-flow"
+                "@id": "urn:ex/zone-312-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-window-switch-on-off",
+        "@id": "urn:ex/vav-506-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/zone-207-window-switch-on-off",
+        "@id": "urn:ex/vav-513-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-509-cooling-pid-output",
+        "@id": "urn:ex/vav-504-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-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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-flow-setpoint",
+        "@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": [
             {
-                "@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-508-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://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-538-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -32547,25 +32259,53 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-526-duct-after-damper",
+        "@id": "urn:ex/zone-106-107",
         "@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-106-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-107-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-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-539-reheat-coil-air-in",
+        "@id": "urn:ex/vav-537-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -32575,97 +32315,126 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-flow",
+        "@id": "urn:ex/vav-538-more-heat-requests",
         "@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-Discharge"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-reheat-coil-valve",
+        "@type": [
+            "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/VolumeFlowRate"
+                "@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/FT3-PER-MIN"
+                "@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-539-more-heat-requests",
+        "@id": "urn:ex/zone-213-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-536-hot-water-in-connection",
+        "@id": "urn:ex/vav-531",
         "@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-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": "urn:ex/vav-531-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-531-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-air-out",
+        "@id": "urn:ex/zone-207",
         "@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-307-308"
+                "@id": "urn:ex/room-207-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-531-discharge-air-flow"
+                "@id": "urn:ex/zone-207-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-531-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-207-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-531-discharge-air-temp"
+                "@id": "urn:ex/zone-207-occupancy"
             },
             {
-                "@id": "urn:ex/vav-531-discharge-air-temp-setpoint"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-508-air-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/zone-207-occupancy-override"
+            },
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/zone-207-temp"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/zone-207-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-in-connection",
+        "@id": "urn:ex/vav-522-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -32677,223 +32446,267 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-534-heating-pid-output",
+        "@id": "urn:ex/vav-508-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/vav-533-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-clg-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-533-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-314",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-533-hot-water-out"
+                "@id": "urn:ex/room-314-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-521-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-534-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-517-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-203"
             }
         ],
         "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-517-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-517-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-534-hot-water-out"
+                "@id": "urn:ex/vav-517-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve",
         "@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-525-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-529-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-529-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-duct-after-damper",
+        "@id": "urn:ex/vav-522-discharge-air-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/vav-522-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-522-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536",
+        "@id": "urn:ex/vav-512-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-536-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-536-air-out"
+                "@id": "urn:ex/vav-512-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-536-hot-water-in"
-            },
+                "@id": "urn:ex/vav-512-reheat-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-536-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-536-damper"
+                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-536-reheat-coil"
-            },
+                "@id": "urn:ex/vav-512-reheat-coil-valve-position"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-306",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve"
+                "@id": "urn:ex/room-306-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-cooling-setpoint",
+        "@id": "urn:ex/room-101-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-101-in"
+            },
+            {
+                "@id": "urn:ex/room-101-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-523-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-540-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-540-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-540-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-temp-sensor",
+        "@id": "urn:ex/zone-211-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-208-hvac-domain"
+                "@id": "urn:ex/room-211-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-208-209-temp"
+                "@id": "urn:ex/zone-211-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-occupancy-sensor",
+        "@id": "urn:ex/vav-512-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-305-hvac-domain"
+                "@id": "urn:ex/vav-512-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-305-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-310",
         "@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-310-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-hot-water-out",
+        "@id": "urn:ex/vav-510-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-hot-water-out-connection"
+                "@id": "urn:ex/vav-510-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -32903,7 +32716,7 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-command",
+        "@id": "urn:ex/vav-520-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -32919,47 +32732,70 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-in",
+        "@id": "urn:ex/vav-536-discharge-air-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/vav-536-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-538-air-in"
+                "@id": "urn:ex/vav-536-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-water-out",
+        "@id": "urn:ex/office-ahu-ea-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-511-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-ea-damper-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ea-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-ea-damper-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ea-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Exhaust"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-temp",
+        "@id": "urn:ex/zone-210-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-532-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"
@@ -32972,14 +32808,21 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-212-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-527-pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-508-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -32988,35 +32831,64 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-in-connection",
+        "@id": "urn:ex/zone-215-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#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@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/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/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/room-303-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/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/room-117-in"
+            },
+            {
+                "@id": "urn:ex/room-117-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-110-window-switch-on-off",
+        "@id": "urn:ex/zone-111-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -33027,13 +32899,13 @@
         ]
     },
     {
-        "@id": "urn:ex/room-106-out",
+        "@id": "urn:ex/vav-506-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": [
@@ -33043,48 +32915,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-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-536-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-536-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-536-damper-command"
-            },
-            {
-                "@id": "urn:ex/vav-536-damper-position"
+                "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@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://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-air-in",
+        "@id": "urn:ex/vav-539-air-in",
         "@type": [
             "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": [
@@ -33094,129 +32947,121 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-heating-pid-output",
+        "@id": "urn:ex/vav-539-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-116-117-heating-setpoint",
+        "@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": [
             {
-                "@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-537-hot-water-in",
+        "@id": "urn:ex/zone-206-co2-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-537-hot-water-in-connection"
+                "@id": "urn:ex/room-206-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-206-co2-concentration"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-215",
+        "@id": "urn:ex/vav-508",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "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-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-103",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
+                "@id": "urn:ex/vav-508-air-in"
+            },
             {
-                "@id": "urn:ex/room-103-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@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-508-air-out"
+            },
             {
-                "@id": "urn:ex/connection-to-room-103"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-508-hot-water-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-508-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-513-heating-pid-output"
+                "@id": "urn:ex/vav-508-damper"
             },
             {
-                "@id": "urn:ex/vav-513-more-heat-requests"
+                "@id": "urn:ex/vav-508-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-508-reheat-coil-valve"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-509-hot-water-out-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-513-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-heating-setpoint",
+        "@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/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/office-ahu-htg-coil-air-in",
+        "@id": "urn:ex/vav-508-reheat-coil-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/vav-508-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -33226,157 +33071,95 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-313",
+        "@id": "urn:ex/vav-503-hot-water-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-313-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-503-hot-water-in-connection"
             }
         ],
-        "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://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-313-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper",
+        "@id": "urn:ex/office-ahu-htg-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-510-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-510-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-510-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-510-damper-position"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-213-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-213-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-520-discharge-air-flow"
+                "@id": "urn:ex/zone-213-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-temp",
+        "@id": "urn:ex/vav-526-air-out",
         "@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"
-            }
+            "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/connection-to-room-212"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-526-more-heat-requests",
-        "@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-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-515-heating-pid-output",
-        "@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/Dimensionless"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-526-discharge-air-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
-            }
-        ]
-    },
-    {
-        "@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-526-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-526-discharge-air-temp"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-526-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve",
+        "@id": "urn:ex/vav-505-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-519-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -33386,15 +33169,15 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-temp",
+        "@id": "urn:ex/zone-215-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -33410,195 +33193,175 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-509-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/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-503-damper-position",
+        "@id": "urn:ex/office-ahu-ea-damper-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/office-ahu-duct-after-ra-fan"
             }
         ],
-        "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-313-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-513-duct-after-damper",
+        "@id": "urn:ex/vav-533-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/vav-533-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-533-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-temp-sensor",
+        "@id": "urn:ex/zone-204-205-occupancy",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-210-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104",
+        "@id": "urn:ex/vav-524-damper-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-104-hvac-domain"
+                "@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"
             }
         ],
-        "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#mapsTo": [
             {
-                "@id": "urn:ex/zone-104-window-switch-on-off"
+                "@id": "urn:ex/vav-524-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-position",
+        "@id": "urn:ex/zone-112-114-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-509-hot-water-out-connection",
+        "@id": "urn:ex/vav-516-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-516-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-516-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-heating-pid-output",
+        "@id": "urn:ex/vav-516-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/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-210-hvac-domain",
+        "@id": "urn:ex/vav-539-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-210-in"
-            },
-            {
-                "@id": "urn:ex/room-210-out"
+                "@id": "urn:ex/vav-539-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-522-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-539-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-539-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-hot-water-out-connection",
+        "@id": "urn:ex/vav-525-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -33610,159 +33373,140 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-flow",
+        "@id": "urn:ex/vav-540-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-Supply"
+                "@id": "urn:ex/vav-540-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-540-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-540-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-command",
+        "@id": "urn:ex/vav-519-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/DimensionlessRatio"
+                "@id": "urn:ex/vav-519-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-536-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-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-505-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-air-out",
+        "@id": "urn:ex/vav-506-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/connection-to-room-109"
-            }
-        ],
-        "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-101-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@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-538-hot-water-in",
+        "@id": "urn:ex/vav-534-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-538-hot-water-in-connection"
+                "@id": "urn:ex/vav-534-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-534-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-113-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-534-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-523-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/vav-534-air-out"
+                "@id": "urn:ex/vav-523-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-523-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-temp"
+                "@id": "urn:ex/vav-523-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-523-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-213-out",
+        "@id": "urn:ex/vav-535-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-connection-from-rooms"
+                "@id": "urn:ex/vav-535-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -33772,13 +33516,13 @@
         ]
     },
     {
-        "@id": "urn:ex/room-215-out",
+        "@id": "urn:ex/office-ahu-ea-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/office-ahu-ea-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -33788,29 +33532,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-514-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-105-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/DEG_C"
             }
         ]
     },
@@ -33838,164 +33576,127 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve",
+        "@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-518-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#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-command",
+        "@id": "urn:ex/room-304-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-519-hot-water-out-connection",
+        "@id": "urn:ex/vav-525-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-528",
-        "@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-528-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-528-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-528-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-528-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-528-damper"
-            },
-            {
-                "@id": "urn:ex/vav-528-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-105-hvac-domain",
+        "@id": "urn:ex/room-103-in",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-105-in"
-            },
-            {
-                "@id": "urn:ex/room-105-out"
+                "@id": "urn:ex/connection-to-room-103"
             }
         ],
-        "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/office-ahu-connection-from-rooms",
+        "@id": "urn:ex/vav-523-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#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-523-hot-water-in-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": [
             {
                 "@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#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-523-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-hot-water-out-connection",
+        "@id": "urn:ex/vav-535-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-535-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-535-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-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-526-duct-after-damper"
+                "@id": "urn:ex/vav-512-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -34005,81 +33706,100 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-526-colder-supply-air-requests"
+                "@id": "urn:ex/vav-512-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-526-cooling-pid-output"
+                "@id": "urn:ex/vav-512-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve",
+        "@id": "urn:ex/office-ahu-clg-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-521-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-chilled-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-521-reheat-coil-valve-command"
-            },
+                "@id": "urn:ex/office-ahu-colder-chilled-water-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-position"
+                "@id": "urn:ex/office-ahu-chilled-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-505-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/vav-507-air-out"
+                "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-water-out",
+        "@id": "urn:ex/zone-311",
         "@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-531-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-311-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#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"
+            },
+            {
+                "@id": "urn:ex/zone-311-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-114-in",
+        "@id": "urn:ex/room-209-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-112-114"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -34089,184 +33809,192 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-214-temp-sensor",
+        "@id": "urn:ex/vav-506-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-214-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-214-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-temp-sensor",
+        "@id": "urn:ex/vav-509-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-206-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-206-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-temp-sensor",
+        "@id": "urn:ex/vav-512-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/room-207-hvac-domain"
+                "@id": "urn:ex/connection-to-room-118"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-207-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-516-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-516-damper-in"
+                "@id": "urn:ex/vav-512-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-516-damper-out"
+                "@id": "urn:ex/vav-512-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-516-damper-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-516-damper-position"
+                "@id": "urn:ex/vav-512-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-command",
+        "@id": "urn:ex/room-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#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/room-308-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-528-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/vav-510-air-out"
+                "@id": "urn:ex/vav-528-reheat-coil-air-in"
+            },
+            {
+                "@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#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-510-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-duct-after-damper",
+        "@id": "urn:ex/room-304",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "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:ex/room-304-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-208-hvac-domain",
+        "@id": "urn:ex/office-ahu-ra-fan-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-208-in"
-            },
-            {
-                "@id": "urn:ex/room-208-out"
+                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
             }
         ],
-        "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-208-209-occupancy-override",
+        "@id": "urn:ex/vav-532-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-505-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-503-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/DimensionlessRatio"
+                "@id": "urn:ex/vav-503-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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-503-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-501-damper-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/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-501-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-duct-after-damper",
+        "@id": "urn:ex/zone-203-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-duct-after-ra-fan",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -34278,13 +34006,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-in",
+        "@id": "urn:ex/vav-538-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-213"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -34292,14 +34020,73 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "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-538-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-538-discharge-air-temp-setpoint"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-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-521-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-valve-command"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-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-532-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-529-air-in"
+                "@id": "urn:ex/vav-532-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-532-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-202-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -34315,104 +34102,89 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-203-cooling-setpoint",
+        "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator",
         "@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-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-504-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-523-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-504-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-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/vav-504-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-cooling-setpoint",
+        "@id": "urn:ex/room-301-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-535-damper-position",
+        "@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/DimensionlessRatio"
+                "@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/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-cooling-setpoint",
+        "@id": "urn:ex/vav-518-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/room-104-out",
+        "@id": "urn:ex/vav-525-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": [
@@ -34422,7 +34194,7 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-connection-to-vavs",
+        "@id": "urn:ex/connection-to-room-106-107",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -34434,107 +34206,86 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-537-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/DimensionlessRatio"
+                "@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/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-104-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-104-in"
+                "@id": "urn:ex/vav-537-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/room-104-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-537-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-flow",
+        "@id": "urn:ex/vav-524-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/vav-517-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-510-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-510-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@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#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-510-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-occupancy",
+        "@id": "urn:ex/vav-526-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-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-air-in",
+        "@id": "urn:ex/vav-540-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": [
@@ -34544,16 +34295,16 @@
         ]
     },
     {
-        "@id": "urn:ex/room-111-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-111-in"
+                "@id": "urn:ex/room-109-in"
             },
             {
-                "@id": "urn:ex/room-111-out"
+                "@id": "urn:ex/room-109-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -34563,14 +34314,30 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-htg-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/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-504-discharge-air-flow-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -34584,38 +34351,57 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-water-in",
+        "@id": "urn:ex/vav-523-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-515-hot-water-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@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": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve",
+        "@id": "urn:ex/vav-523-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-525-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-523-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-523-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -34625,102 +34411,120 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-523-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-523-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-actuator",
+        "@id": "urn:ex/office-ahu-ra-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-501-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-ra-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
+                "@id": "urn:ex/office-ahu-ra-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112-hvac-domain",
+        "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-112-in"
-            },
-            {
-                "@id": "urn:ex/room-112-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/zone-212-temp",
+        "@id": "urn:ex/vav-535-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-535-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-535-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-air-out",
+        "@id": "urn:ex/vav-504-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-202"
+                "@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-531-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-518-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-518-more-heat-requests"
+                "@id": "urn:ex/vav-531-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-518-air-out"
+                "@id": "urn:ex/vav-531-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-air-in",
+        "@id": "urn:ex/vav-507-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"
+                "@id": "urn:ex/vav-507-reheat-coil-air-in"
+            },
+            {
+                "@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://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -34729,39 +34533,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517",
+        "@id": "urn:ex/vav-513-reheat-coil-air-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-517-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-517-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-517-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-517-hot-water-out"
+                "@id": "urn:ex/vav-513-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-517-damper"
-            },
-            {
-                "@id": "urn:ex/vav-517-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-hot-water-in-connection",
+        "@id": "urn:ex/vav-514-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -34773,28 +34561,66 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-in",
+        "@id": "urn:ex/vav-520-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/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-520-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-520-discharge-air-flow"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/vav-512-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-504-air-in"
+                "@id": "urn:ex/vav-512-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-flow",
+        "@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-OnOff"
+            }
+        ]
+    },
+    {
+        "@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/vav-521-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-521-discharge-air-temp"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -34815,21 +34641,25 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-out-connection",
+        "@id": "urn:ex/vav-523-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-539-damper-position",
+        "@id": "urn:ex/vav-530-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -34843,68 +34673,71 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-command",
+        "@id": "urn:ex/zone-103-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-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-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-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-538-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-538-reheat-coil-air-out"
-            },
+                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-530-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-water-out"
+                "@id": "urn:ex/vav-530-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/room-206-hvac-domain",
+        "@id": "urn:ex/vav-521-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-206-in"
-            },
-            {
-                "@id": "urn:ex/room-206-out"
+                "@id": "urn:ex/vav-521-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-535-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-507-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -34920,61 +34753,93 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-211-heating-setpoint",
+        "@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-506-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505-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/zone-211-occupancy-sensor",
+        "@id": "urn:ex/vav-527-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-211-hvac-domain"
+                "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-211-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-536-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-523-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-213",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-523-discharge-air-flow"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-air-in",
+        "@id": "urn:ex/room-108-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-108"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -34984,28 +34849,30 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-temp",
+        "@id": "urn:ex/zone-211-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://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/vav-529-hot-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/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-occupancy",
+        "@id": "urn:ex/zone-111-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -35016,47 +34883,45 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper",
+        "@id": "urn:ex/vav-523-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-530-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-damper-out"
+                "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-530-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-530-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-colder-supply-air-requests",
+        "@id": "urn:ex/room-102-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/connection-to-room-102"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207-in",
+        "@id": "urn:ex/room-302-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/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -35066,20 +34931,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527-colder-supply-air-requests",
+        "@id": "urn:ex/zone-211",
         "@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-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/zone-211-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-211-occupancy"
+            },
+            {
+                "@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/room-314-out",
+        "@id": "urn:ex/office-ahu-ra-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
@@ -35090,114 +34981,143 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/office-ahu-ra-flow"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-temp"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-516-damper-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/vav-516-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-518-hot-water-out"
+                "@id": "urn:ex/vav-516-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-516-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-537-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/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-508-damper-out",
+        "@id": "urn:ex/vav-540-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-508-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-524-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-colder-supply-air-requests"
-            },
+                "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-508-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-occupancy-sensor",
+        "@id": "urn:ex/vav-520-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-215-hvac-domain"
+                "@id": "urn:ex/vav-520-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/zone-215-occupancy"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-occupancy-override",
+        "@id": "urn:ex/zone-109-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-Override"
+                "@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-514-reheat-coil",
+        "@id": "urn:ex/vav-515-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-514-reheat-coil-air-in"
+                "@id": "urn:ex/vav-515-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-air-out"
+                "@id": "urn:ex/vav-515-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-water-in"
+                "@id": "urn:ex/vav-515-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-water-out"
+                "@id": "urn:ex/vav-515-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -35207,7 +35127,18 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-211",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-211-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -35219,74 +35150,94 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-514-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-504-air-out"
+                "@id": "urn:ex/vav-514-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-504-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-air-in",
+        "@id": "urn:ex/vav-527-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/vav-526-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-534-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-206-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-534-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-534-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-506-reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-529-air-in"
+                "@id": "urn:ex/vav-540-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-529-discharge-air-flow"
+                "@id": "urn:ex/vav-540-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-in-connection",
+        "@id": "urn:ex/vav-535-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-535-hot-water-in-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -35295,71 +35246,94 @@
         ]
     },
     {
-        "@id": "urn:ex/room-201-out",
+        "@id": "urn:ex/vav-515-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-116-117"
             }
         ],
         "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": "urn:ex/vav-501-reheat-coil-water-out",
+        "@id": "urn:ex/vav-534-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-501-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/zone-113-occupancy-sensor",
+        "@id": "urn:ex/vav-529-damper-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-113-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-113-occupancy"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-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-516-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-535-colder-supply-air-requests",
+        "@id": "urn:ex/vav-507-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -35370,206 +35344,201 @@
         ]
     },
     {
-        "@id": "urn:ex/room-211-in",
+        "@id": "urn:ex/vav-503-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/connection-to-room-211"
+                "@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-518-air-out",
+        "@id": "urn:ex/vav-536-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/connection-to-room-202"
+                "@id": "urn:ex/vav-536-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-536-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-518-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-518-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-518-discharge-air-temp"
+                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-518-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-536-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-210-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/connection-to-room-210"
+                "@id": "urn:ex/vav-525-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-525-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/vav-534-discharge-air-flow",
-        "@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/vav-525-reheat-coil-valve-command"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-525-reheat-coil-valve-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-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-535-damper",
+        "@id": "urn:ex/vav-522-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-535-damper-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-535-damper-out"
+                "@id": "urn:ex/vav-522-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-535-damper-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-535-damper-position"
+                "@id": "urn:ex/vav-522-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-in",
+        "@id": "urn:ex/vav-522-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-522-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-528-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve",
+        "@id": "urn:ex/vav-515-damper-command",
         "@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-531-reheat-coil-valve-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-531-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/vav-512-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-temp",
+        "@id": "urn:ex/connection-to-room-311",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "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#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-discharge-air-temp-sensor",
+        "@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/Temperature"
+                "@id": "urn:ex/vav-532-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-532-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-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/vav-529-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-309-310"
             }
         ],
         "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": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-command",
+        "@id": "urn:ex/vav-520-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -35583,39 +35552,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-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/vav-517-hot-water-out-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/vav-505-reheat-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/vav-505-reheat-coil-air-in"
+                "@id": "urn:ex/vav-514-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-505-reheat-coil-air-out"
+                "@id": "urn:ex/vav-514-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-505-reheat-coil-water-in"
+                "@id": "urn:ex/vav-514-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-505-reheat-coil-water-out"
+                "@id": "urn:ex/vav-514-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -35625,281 +35589,277 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-207-occupancy-sensor",
+        "@id": "urn:ex/zone-214-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-207-hvac-domain"
+                "@id": "urn:ex/room-214-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-207-occupancy"
+                "@id": "urn:ex/zone-214-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-duct-after-damper",
+        "@id": "urn:ex/vav-528-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-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/vav-519-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-540",
+        "@id": "urn:ex/vav-540-reheat-coil-air-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-540-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-540-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-540-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-540-hot-water-out"
+                "@id": "urn:ex/vav-540-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-540-damper"
-            },
-            {
-                "@id": "urn:ex/vav-540-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-command",
+        "@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": [
             {
-                "@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-hot-water-out",
+        "@id": "urn:ex/vav-534-reheat-coil-valve-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/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-528-damper-command",
+        "@id": "urn:ex/zone-302-co2-concentration-setpoint",
         "@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/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-311",
+        "@id": "urn:ex/vav-504-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-311-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-temp",
+        "@id": "urn:ex/vav-528-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-540-air-in",
+        "@id": "urn:ex/zone-206-co2-concentration-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@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://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-flow-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/vav-533-air-in"
+                "@id": "urn:ex/vav-515-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-533-discharge-air-flow"
+                "@id": "urn:ex/vav-515-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-actuator",
+        "@id": "urn:ex/vav-501-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-524-damper"
+                "@id": "urn:ex/vav-501-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-524-damper-command"
+                "@id": "urn:ex/vav-501-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-cooling-pid-output",
+        "@id": "urn:ex/vav-526-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/Dimensionless"
-            }
+            "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/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-occupancy-sensor",
+        "@id": "urn:ex/vav-513-discharge-air-temp",
         "@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#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/zone-314-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-cooling-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/zone-303-304-306-temp",
+        "@id": "urn:ex/room-209",
         "@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#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-209-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-occupancy-override",
+        "@id": "urn:ex/vav-511-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-Override"
+                "@id": "urn:ex/vav-511-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-511-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-colder-supply-air-requests",
+        "@id": "urn:ex/vav-539-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -35910,13 +35870,13 @@
         ]
     },
     {
-        "@id": "urn:ex/room-313-out",
+        "@id": "urn:ex/vav-508-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": [
@@ -35926,111 +35886,92 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-air-in",
+        "@id": "urn:ex/vav-512-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/room-313-hvac-domain",
+        "@id": "urn:ex/vav-536-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-313-in"
+                "@id": "urn:ex/connection-to-room-313"
+            }
+        ],
+        "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-heating-pid-output"
             },
             {
-                "@id": "urn:ex/room-313-out"
+                "@id": "urn:ex/vav-536-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-536-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-cooling-setpoint",
+        "@id": "urn:ex/vav-514-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-519",
+        "@id": "urn:ex/vav-533-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-519-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-519-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-519-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-519-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-519-damper"
-            },
-            {
-                "@id": "urn:ex/vav-519-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-connection-from-rooms",
         "@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/vav-505-damper-position",
+        "@id": "urn:ex/office-ahu-ea-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -36046,46 +35987,49 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper",
+        "@id": "urn:ex/zone-301-temp-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-539-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-539-damper-out"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-539-damper-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-damper-position"
+                "@id": "urn:ex/zone-301-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-cooling-setpoint",
+        "@id": "urn:ex/vav-518-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-518-reheat-coil-air-in"
+            },
+            {
+                "@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/vav-532-duct-after-damper",
+        "@id": "urn:ex/connection-to-room-210",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -36097,208 +36041,227 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-heating-pid-output",
+        "@id": "urn:ex/vav-535-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/Dimensionless"
+                "@id": "urn:ex/vav-535-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-535-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-535-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-535-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-out",
+        "@id": "urn:ex/vav-535",
         "@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-512-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-535-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-512-colder-supply-air-requests"
+                "@id": "urn:ex/vav-535-damper"
             },
             {
-                "@id": "urn:ex/vav-512-cooling-pid-output"
+                "@id": "urn:ex/vav-535-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve",
+        "@id": "urn:ex/vav-535-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#cnx": [
-            {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-out"
-            }
+            "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-HotWater"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-air-out",
+        "@id": "urn:ex/room-308-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-110"
+                "@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-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-507-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-507-discharge-air-temp"
-            },
-            {
-                "@id": "urn:ex/vav-507-discharge-air-temp-setpoint"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-temp-sensor",
+        "@id": "urn:ex/vav-510-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-313-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-313-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-heating-pid-output",
+        "@id": "urn:ex/vav-521-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-303-304-306-occupancy",
+        "@id": "urn:ex/vav-502-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-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-113",
+        "@id": "urn:ex/room-202",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-113-hvac-domain"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-occupancy-sensor",
+        "@id": "urn:ex/room-213-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-212-hvac-domain"
+                "@id": "urn:ex/room-213-in"
+            },
+            {
+                "@id": "urn:ex/room-213-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-212-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-out-connection",
+        "@id": "urn:ex/vav-524-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"
+            }
+        ],
+        "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-514",
         "@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-527-hot-water-in-connection"
+                "@id": "urn:ex/vav-514-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-514-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-514-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-514-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-514-damper"
+            },
+            {
+                "@id": "urn:ex/vav-514-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-514-reheat-coil-valve"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-539-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-527-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -36314,47 +36277,26 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-out",
+        "@id": "urn:ex/room-214-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-514-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-514-colder-supply-air-requests"
+                "@id": "urn:ex/room-214-in"
             },
             {
-                "@id": "urn:ex/vav-514-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-113-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/room-214-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-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-538-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -36366,9 +36308,9 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-damper-command",
+        "@id": "urn:ex/vav-538-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -36382,626 +36324,572 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-htg-coil",
+        "@id": "urn:ex/vav-531-damper-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/vav-506-damper-out",
+        "@id": "urn:ex/vav-537",
         "@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-506-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-537-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-537-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-537-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-506-colder-supply-air-requests"
+                "@id": "urn:ex/vav-537-damper"
             },
             {
-                "@id": "urn:ex/vav-506-cooling-pid-output"
+                "@id": "urn:ex/vav-537-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-air-in",
+        "@id": "urn:ex/vav-522-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"
+                "@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#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/connection-to-room-104",
+        "@id": "urn:ex/vav-537-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-312-heating-setpoint",
+        "@id": "urn:ex/office-ahu-htg-coil-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/Temperature"
+                "@id": "urn:ex/office-ahu-duct-after-htg-coil"
             }
         ],
-        "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-517-damper-command",
+        "@id": "urn:ex/zone-314-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-509-discharge-air-temp",
+        "@id": "urn:ex/vav-527-cooling-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/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-531-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-518-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-531-air-in"
+                "@id": "urn:ex/vav-518-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-531-discharge-air-flow"
+                "@id": "urn:ex/vav-518-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-co2-concentration-setpoint",
+        "@id": "urn:ex/zone-212-occupancy-override",
         "@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-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-command",
+        "@id": "urn:ex/vav-538-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-538-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-538-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-hot-water-out-connection",
+        "@id": "urn:ex/vav-503-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/room-111-out",
+        "@id": "urn:ex/vav-520-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-connection-from-rooms"
+                "@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-520-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-out",
+        "@id": "urn:ex/zone-301-heating-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-504-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-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-505-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-539-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-539-hot-water-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-531-hot-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@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/vav-505-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-occupancy-sensor",
+        "@id": "urn:ex/vav-508-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-202-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-202-occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-307-hvac-domain",
+        "@id": "urn:ex/room-311-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-307-in"
-            },
-            {
-                "@id": "urn:ex/room-307-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/vav-501-cooling-pid-output",
+        "@id": "urn:ex/vav-509-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-509-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-509-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-502-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-503-reheat-coil-water-out",
+        "@id": "urn:ex/vav-510-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-503-pipe-hot-water-return-before-valve"
+                "@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/vav-516-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-525-damper-position",
         "@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#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-516-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-cooling-pid-output",
+        "@id": "urn:ex/zone-101-co2-concentration",
         "@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/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve",
+        "@id": "urn:ex/connection-to-room-203",
         "@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-530-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "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-527-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514",
+        "@id": "urn:ex/vav-540-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-514-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-514-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-514-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-514-hot-water-out"
+                "@id": "urn:ex/vav-540-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-514-damper"
-            },
-            {
-                "@id": "urn:ex/vav-514-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve"
+                "@id": "urn:ex/vav-540-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-116",
+        "@id": "urn:ex/vav-525-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-116-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-214-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-526-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-526-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-air-in",
+        "@id": "urn:ex/vav-536-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-501-reheat-coil-valve",
+        "@id": "urn:ex/zone-301",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "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/vav-501-reheat-coil-valve-in"
-            },
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-out"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
+                "@id": "urn:ex/zone-301-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-111-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/zone-301-heating-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@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-532-damper-position",
+        "@id": "urn:ex/vav-524-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-536-discharge-air-temp",
+        "@id": "urn:ex/room-115-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-115-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-115-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-511-hot-water-out",
+        "@id": "urn:ex/vav-511-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/vav-511-hot-water-out-connection"
+                "@id": "urn:ex/vav-511-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-511-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-window-switch-on-off",
+        "@id": "urn:ex/vav-536-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-536-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-516-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://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-303-hvac-domain",
+        "@id": "urn:ex/vav-520-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-303-in"
-            },
-            {
-                "@id": "urn:ex/room-303-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "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-507-reheat-coil-valve-out",
+        "@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-507-hot-water-out-connection"
+                "@id": "urn:ex/vav-522-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -37011,60 +36899,60 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-507-hot-water-out"
+                "@id": "urn:ex/vav-522-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-position",
+        "@id": "urn:ex/vav-531-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-509-hot-water-out",
+        "@id": "urn:ex/room-105-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-105"
             }
         ],
         "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-303-304-306-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/room-303-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-303-304-306-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-temp",
+        "@id": "urn:ex/vav-510-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -37075,201 +36963,219 @@
         ],
         "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-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-535-damper-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-out"
+                "@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-temp"
+                "@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-519-hot-water-in",
+        "@id": "urn:ex/vav-518-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-519-hot-water-in-connection"
+                "@id": "urn:ex/vav-518-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-518-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-518-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-518-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-305-out",
+        "@id": "urn:ex/vav-536-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-501-damper-in",
+        "@id": "urn:ex/vav-524-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-501-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-hot-water-in",
+        "@id": "urn:ex/vav-535-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-525-hot-water-in-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/room-213-in",
+        "@id": "urn:ex/vav-516",
         "@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/connection-to-room-213"
+                "@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#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-516-damper"
+            },
+            {
+                "@id": "urn:ex/vav-516-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-516-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-in",
+        "@id": "urn:ex/room-204-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-duct-after-clg-coil"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-204-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-204-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/office-ahu-sa-flow"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-113",
+        "@id": "urn:ex/vav-508-discharge-air-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-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-534-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-530-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/zone-312-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-538-damper-command",
+        "@id": "urn:ex/vav-516-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-516-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-516-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-air-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-513-duct-after-damper"
+                "@id": "urn:ex/vav-534-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -37279,36 +37185,29 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-118-occupancy",
+        "@id": "urn:ex/office-ahu-clg-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-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-501-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/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-out",
+        "@id": "urn:ex/vav-509-damper-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/vav-509-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -37318,21 +37217,32 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-505-colder-supply-air-requests"
+                "@id": "urn:ex/vav-509-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-505-cooling-pid-output"
+                "@id": "urn:ex/vav-509-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-in",
+        "@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/vav-524-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-524-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -37342,23 +37252,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-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/vav-533-air-out"
+                "@id": "urn:ex/office-ahu-sa-fan-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-533-discharge-air-temp"
+                "@id": "urn:ex/office-ahu-sa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-flow",
+        "@id": "urn:ex/vav-514-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-515-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-519-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -37379,78 +37312,123 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-512-hot-water-out-connection",
+        "@id": "urn:ex/room-113-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-113-in"
+            },
+            {
+                "@id": "urn:ex/room-113-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-208",
+        "@id": "urn:ex/vav-526-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-208-hvac-domain"
+                "@id": "urn:ex/vav-526-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-526-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-526-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-526-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-more-heat-requests",
+        "@id": "urn:ex/vav-519-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/room-304-hvac-domain",
+        "@id": "urn:ex/vav-533-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-304-in"
+                "@id": "urn:ex/vav-533-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-533-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/room-304-out"
+                "@id": "urn:ex/vav-533-cooling-pid-output"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-air-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#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-cooling-pid-output",
+        "@id": "urn:ex/vav-528-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/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"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-water-out",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
@@ -37464,13 +37442,29 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-in",
+        "@id": "urn:ex/vav-531-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/vav-531-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-531-discharge-air-flow"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-539-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-214"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -37480,10 +37474,16 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-ra-flow"
+                "@id": "urn:ex/vav-539-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/office-ahu-ra-temp"
+                "@id": "urn:ex/vav-539-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-539-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-539-discharge-air-temp-setpoint"
             }
         ]
     }
diff --git a/nrel-example.jsonld b/nrel-example.jsonld
index af91c789..5dd120ce 100644
--- a/nrel-example.jsonld
+++ b/nrel-example.jsonld
@@ -1,206 +1,183 @@
 [
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-        "@type": [
-            "http://data.ashrae.org/standard223#Class",
-            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-            "http://www.w3.org/ns/shacl#NodeShape"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "EnumerationKind AlarmStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000292",
+        "@id": "urn:nrel_example/nrel00000550",
         "@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": "nrel00000292"
+                "@value": "nrel00000550"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000959",
+        "@id": "urn:nrel_example/nrel00000339",
         "@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": "nrel00000959"
+                "@value": "nrel00000339"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000925",
+        "@id": "urn:nrel_example/nrel00000076",
         "@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/nrel00000441"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000118"
+                "@id": "urn:nrel_example/nrel00001047"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000925"
+                "@value": "nrel00000076"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001111",
+        "@id": "urn:nrel_example/nrel00000419",
         "@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": "nrel00001111"
+                "@value": "nrel00000419"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000712",
+        "@id": "urn:nrel_example/nrel00000454",
         "@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-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000019"
+            },
             {
-                "@value": "nrel00000712"
+                "@id": "urn:nrel_example/nrel00001018"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001300",
-        "@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/nrel00000411"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000962"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001300"
+                "@value": "nrel00000454"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000269",
+        "@id": "urn:nrel_example/nrel00000240",
         "@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": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "nrel00000269"
+                "@id": "urn:nrel_example/nrel00000589"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000423",
-        "@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": "nrel00000423"
+                "@value": "nrel00000240"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001286",
+        "@id": "urn:nrel_example/nrel00000764",
         "@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": "nrel00001286"
+                "@value": "nrel00000764"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001266",
+        "@id": "urn:nrel_example/nrel00000626",
         "@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/nrel00000321"
+                "@id": "urn:nrel_example/nrel00000004"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000955"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000936"
+                "@id": "urn:nrel_example/nrel00001030"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001218"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001266"
+                "@value": "nrel00000626"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001328",
+        "@id": "urn:nrel_example/nrel00001136",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -209,174 +186,167 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001328"
+                "@value": "nrel00001136"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000060",
+        "@id": "urn:nrel_example/nrel00000015",
         "@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#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": "nrel00000060"
+                "@value": "nrel00000015"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000356",
+        "@id": "urn:nrel_example/nrel00000169",
         "@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": "nrel00000356"
+                "@value": "nrel00000169"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001106",
+        "@id": "urn:nrel_example/nrel00000617",
         "@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-FlowStatus"
+                "@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": "nrel00001106"
+                "@value": "nrel00000617"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000976",
+        "@id": "urn:nrel_example/nrel00000831",
         "@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/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000976"
+                "@value": "nrel00000831"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001188",
+        "@id": "urn:nrel_example/nrel00001266",
         "@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:nrel_example/nrel00000321"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000936"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001188"
+                "@value": "nrel00001266"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001259",
+        "@id": "urn:nrel_example/nrel00000510",
         "@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/nrel00000961"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000475"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001259"
+                "@value": "nrel00000510"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001186",
+        "@id": "urn:nrel_example/nrel00001055",
         "@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/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": "nrel00001186"
+                "@value": "nrel00001055"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000742",
+        "@id": "urn:nrel_example/nrel00000840",
         "@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": "nrel00000742"
+                "@value": "nrel00000840"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000907",
+        "@id": "urn:nrel_example/nrel00000079",
         "@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#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -385,51 +355,65 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000907"
+                "@value": "nrel00000079"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001022",
+        "@id": "urn:nrel_example/nrel00001015",
         "@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/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000487"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001099"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000024"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000979"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001022"
+                "@value": "nrel00001015"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001260",
+        "@id": "urn:nrel_example/nrel00000032",
         "@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": "nrel00001260"
+                "@value": "nrel00000032"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001157",
+        "@id": "urn:nrel_example/nrel00000911",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000869"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001183"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -438,167 +422,157 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001157"
+                "@value": "nrel00000911"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000940",
+        "@id": "urn:nrel_example/nrel00000894",
         "@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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000940"
+                "@value": "nrel00000894"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001010",
+        "@id": "urn:nrel_example/nrel00001253",
         "@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/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001010"
+                "@value": "nrel00001253"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001104",
+        "@id": "urn:nrel_example/nrel00001048",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "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": "nrel00001104"
+                "@value": "nrel00001048"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000287",
+        "@id": "urn:nrel_example/nrel00000272",
         "@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/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": "nrel00000287"
+                "@value": "nrel00000272"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000598",
+        "@id": "urn:nrel_example/nrel00001062",
         "@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": "nrel00000598"
+                "@value": "nrel00001062"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000003",
+        "@id": "urn:nrel_example/nrel00000254",
         "@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#Damper"
         ],
         "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/nrel00000424"
             },
             {
-                "@id": "urn:nrel_example/nrel00000953"
+                "@id": "urn:nrel_example/nrel00001274"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000203"
+                "@id": "urn:nrel_example/nrel00000288"
             },
             {
-                "@id": "urn:nrel_example/nrel00000895"
+                "@id": "urn:nrel_example/nrel00000617"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000003"
+                "@value": "nrel00000254"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001211",
+        "@id": "urn:nrel_example/nrel00000857",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000406"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000574"
+                "@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": "nrel00001211"
+                "@value": "nrel00000857"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000439",
+        "@id": "urn:nrel_example/nrel00000098",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -607,199 +581,182 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000439"
+                "@value": "nrel00000098"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000089",
+        "@id": "urn:nrel_example/nrel00000358",
         "@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": "nrel00000089"
+                "@value": "nrel00000358"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001026",
+        "@id": "urn:nrel_example/nrel00001008",
         "@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/nrel00000092"
+            },
             {
-                "@value": "nrel00001026"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000923",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000400"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000642"
+                "@id": "urn:nrel_example/nrel00000454"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000017"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000305"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000797"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001144"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000067"
+                "@id": "urn:nrel_example/nrel00000275"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000738"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000923"
+                "@value": "nrel00001008"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000691",
+        "@id": "urn:nrel_example/nrel00000560",
         "@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/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": "nrel00000691"
+                "@value": "nrel00000560"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000171",
+        "@id": "urn:nrel_example/nrel00000578",
         "@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/nrel00000098"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001207"
-            }
-        ],
-        "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": "nrel00000171"
+                "@value": "nrel00000578"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001011",
+        "@id": "urn:nrel_example/nrel00000717",
         "@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://data.ashrae.org/standard223#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00001011"
+                "@id": "urn:nrel_example/nrel00000122"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000618",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000517"
+                "@id": "urn:nrel_example/nrel00001027"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001167"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000618"
+                "@value": "nrel00000717"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000002",
+        "@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": "nrel00000002"
+                "@value": "nrel00000042"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000070",
+        "@id": "urn:nrel_example/nrel00000551",
         "@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": "nrel00000070"
+                "@value": "nrel00000551"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001293",
+        "@id": "urn:nrel_example/nrel00000654",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -815,216 +772,157 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001293"
+                "@value": "nrel00000654"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000472",
+        "@id": "urn:nrel_example/nrel00001322",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001241"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000256"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000472"
+                "@value": "nrel00001322"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001267",
+        "@id": "urn:nrel_example/nrel00000589",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000444"
+                "@id": "urn:nrel_example/nrel00000240"
             },
             {
-                "@id": "urn:nrel_example/nrel00000627"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000903"
             }
         ],
-        "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": "nrel00000589"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000366",
+        "@id": "urn:nrel_example/nrel00000308",
         "@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": "nrel00000366"
+                "@value": "nrel00000308"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000593",
+        "@id": "urn:nrel_example/nrel00000899",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000087"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000434"
+                "@id": "urn:nrel_example/nrel00000875"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000301"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001215"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000593"
+                "@value": "nrel00000899"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000629",
+        "@id": "urn:nrel_example/nrel00000243",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000318"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000393"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@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"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001140"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000629"
+                "@value": "nrel00000243"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000163",
+        "@id": "urn:nrel_example/nrel00001213",
         "@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": "nrel00000163"
+                "@value": "nrel00001213"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000911",
+        "@id": "urn:nrel_example/nrel00001286",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000869"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001183"
+                "@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": "nrel00000911"
+                "@value": "nrel00001286"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000487",
+        "@id": "urn:nrel_example/nrel00001172",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -1035,551 +933,568 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000487"
+                "@value": "nrel00001172"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000246",
+        "@id": "urn:nrel_example/nrel00000142",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000182"
+                "@id": "urn:nrel_example/nrel00000641"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000246"
+                "@value": "nrel00000142"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001224",
+        "@id": "urn:nrel_example/nrel00001064",
         "@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": "nrel00001224"
+                "@value": "nrel00001064"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000096",
+        "@id": "urn:nrel_example/nrel00000749",
         "@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/nrel00000715"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000946"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000096"
+                "@value": "nrel00000749"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000117",
+        "@id": "urn:nrel_example/nrel00000397",
         "@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/nrel00000966"
+                "@id": "urn:nrel_example/nrel00000255"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000908"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000282"
+                "@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/nrel00000845"
+                "@value": "nrel00000397"
+            }
+        ]
+    },
+    {
+        "@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-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000117"
+                "@value": "nrel00000696"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000044",
+        "@id": "urn:nrel_example/nrel00001158",
         "@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": "nrel00001158"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000099",
+        "@id": "urn:nrel_example/nrel00000691",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000297"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000541"
+                "@id": "urn:nrel_example/nrel00000535"
             }
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000744"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000954"
-            },
+                "@value": "nrel00000691"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000403",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001147"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000099"
+                "@value": "nrel00000403"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000527",
+        "@id": "urn:nrel_example/nrel00000034",
         "@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": "nrel00000527"
+                "@value": "nrel00000034"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001151",
+        "@id": "urn:nrel_example/nrel00000111",
         "@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/ElectricPotential"
+                "@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/V"
+                "@value": "nrel00000111"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000472",
+        "@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://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001151"
+                "@value": "nrel00000472"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000381",
+        "@id": "urn:nrel_example/nrel00000273",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000049"
+                "@id": "urn:nrel_example/nrel00000214"
             },
             {
-                "@id": "urn:nrel_example/nrel00000582"
+                "@id": "urn:nrel_example/nrel00000293"
             },
             {
-                "@id": "urn:nrel_example/nrel00000657"
+                "@id": "urn:nrel_example/nrel00000920"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000165"
+                "@id": "urn:nrel_example/nrel00000040"
             },
             {
-                "@id": "urn:nrel_example/nrel00001040"
+                "@id": "urn:nrel_example/nrel00000638"
             },
             {
-                "@id": "urn:nrel_example/nrel00001074"
+                "@id": "urn:nrel_example/nrel00000720"
             },
             {
-                "@id": "urn:nrel_example/nrel00001279"
+                "@id": "urn:nrel_example/nrel00001069"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000175"
+                "@id": "urn:nrel_example/nrel00000412"
             },
             {
-                "@id": "urn:nrel_example/nrel00000571"
+                "@id": "urn:nrel_example/nrel00000419"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000381"
+                "@value": "nrel00000273"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000018",
+        "@id": "urn:nrel_example/nrel00000181",
         "@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": "nrel00000018"
+                "@value": "nrel00000181"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000951",
+        "@id": "urn:nrel_example/nrel00000375",
         "@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": "nrel00000951"
+                "@value": "nrel00000375"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000957",
+        "@id": "urn:nrel_example/nrel00000679",
         "@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": "nrel00000957"
+                "@value": "nrel00000679"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000417",
+        "@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/Temperature"
+                "@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/DEG_C"
+                "@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": "nrel00000417"
+                "@value": "nrel00000568"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001179",
+        "@id": "urn:nrel_example/nrel00000799",
         "@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#HeatingCoil"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000217"
+            },
             {
-                "@value": "nrel00001179"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000411",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000613"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001292"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000411"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000022",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000161"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000190"
+                "@id": "urn:nrel_example/nrel00001056"
             },
             {
-                "@id": "urn:nrel_example/nrel00000366"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00001183"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001300"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000022"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000441",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000147"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000565"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000441"
+                "@value": "nrel00000799"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000573",
+        "@id": "urn:nrel_example/nrel00001024",
         "@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/nrel00000941"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000208"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000121"
+                "@id": "urn:nrel_example/nrel00000947"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000404"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000573"
+                "@value": "nrel00001024"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000371",
+        "@id": "urn:nrel_example/nrel00000053",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000723"
+                "@id": "urn:nrel_example/nrel00000461"
             },
             {
-                "@id": "urn:nrel_example/nrel00001275"
+                "@id": "urn:nrel_example/nrel00000931"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000033"
+                "@id": "urn:nrel_example/nrel00000012"
             },
             {
-                "@id": "urn:nrel_example/nrel00000136"
+                "@id": "urn:nrel_example/nrel00000492"
             },
             {
-                "@id": "urn:nrel_example/nrel00000239"
+                "@id": "urn:nrel_example/nrel00000550"
             },
             {
-                "@id": "urn:nrel_example/nrel00000385"
+                "@id": "urn:nrel_example/nrel00000562"
             },
             {
-                "@id": "urn:nrel_example/nrel00000560"
+                "@id": "urn:nrel_example/nrel00000566"
             },
             {
-                "@id": "urn:nrel_example/nrel00000584"
+                "@id": "urn:nrel_example/nrel00000572"
             },
             {
-                "@id": "urn:nrel_example/nrel00000928"
+                "@id": "urn:nrel_example/nrel00000607"
             },
             {
-                "@id": "urn:nrel_example/nrel00001150"
+                "@id": "urn:nrel_example/nrel00000648"
             },
             {
-                "@id": "urn:nrel_example/nrel00001151"
+                "@id": "urn:nrel_example/nrel00000877"
             },
             {
-                "@id": "urn:nrel_example/nrel00001171"
+                "@id": "urn:nrel_example/nrel00001075"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001093"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000371"
+                "@value": "nrel00000053"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001071",
+        "@id": "urn:nrel_example/nrel00001020",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000748"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001236"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001071"
+                "@value": "nrel00001020"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000226",
+        "@id": "urn:nrel_example/nrel00001178",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000031"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000371"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "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/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001316"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000204"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000213"
-            },
+                "@value": "nrel00001178"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001161",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000557"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000803"
-            },
+                "@value": "nrel00001161"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001069",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001293"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000226"
+                "@value": "nrel00001069"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000797",
+        "@id": "urn:nrel_example/nrel00000792",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -1588,21 +1503,16 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00001023"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000797"
+                "@value": "nrel00000792"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000079",
+        "@id": "urn:nrel_example/nrel00000364",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -1611,63 +1521,53 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000079"
+                "@value": "nrel00000364"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000739",
+        "@id": "urn:nrel_example/nrel00000607",
         "@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-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000739"
+                "@value": "nrel00000607"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000673",
+        "@id": "urn:nrel_example/nrel00000220",
         "@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": "nrel00000673"
+                "@value": "nrel00000220"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001325",
+        "@id": "urn:nrel_example/nrel00000130",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000724"
+                "@id": "urn:nrel_example/nrel00000380"
             },
             {
-                "@id": "urn:nrel_example/nrel00000802"
+                "@id": "urn:nrel_example/nrel00000579"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1677,398 +1577,381 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001325"
+                "@value": "nrel00000130"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000122",
+        "@id": "urn:nrel_example/nrel00000352",
         "@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/PositiveDimensionlessRatio"
             }
         ],
-        "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/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000122"
+                "@value": "nrel00000352"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000080",
+        "@id": "urn:nrel_example/nrel00000274",
         "@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#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/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000005"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000319"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000080"
+                "@value": "nrel00000274"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000784",
+        "@id": "urn:nrel_example/nrel00000967",
         "@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": "nrel00000784"
+                "@value": "nrel00000967"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001004",
+        "@id": "urn:nrel_example/nrel00000811",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000221"
-            }
+            "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/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000680"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001004"
+                "@value": "nrel00000811"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000679",
+        "@id": "urn:nrel_example/nrel00000554",
         "@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": "nrel00000679"
+                "@value": "nrel00000554"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000416",
+        "@id": "urn:nrel_example/nrel00000285",
         "@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/nrel00000287"
+                "@id": "urn:nrel_example/nrel00000059"
             },
             {
-                "@id": "urn:nrel_example/nrel00000467"
+                "@id": "urn:nrel_example/nrel00001161"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000314"
-            },
+        "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": "nrel00000285"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001029",
+        "@id": "urn:nrel_example/nrel00001121",
         "@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/nrel00000388"
+                "@id": "urn:nrel_example/nrel00001197"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000673"
+                "@id": "urn:nrel_example/nrel00000009"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000068"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001029"
+                "@value": "nrel00001121"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001057",
+        "@id": "urn:nrel_example/nrel00000656",
         "@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/nrel00000736"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000969"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001295"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001057"
+                "@value": "nrel00000656"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000036",
+        "@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/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00001050"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000518"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000036"
+                "@value": "nrel00000300"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000914",
+        "@id": "urn:nrel_example/nrel00001239",
         "@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": "nrel00000914"
+                "@value": "nrel00001239"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001219",
+        "@id": "urn:nrel_example/nrel00000636",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000462"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000924"
+                "@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": "nrel00001219"
+                "@value": "nrel00000636"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000831",
+        "@id": "urn:nrel_example/nrel00001247",
         "@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": "nrel00000831"
+                "@value": "nrel00001247"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000086",
+        "@id": "urn:nrel_example/nrel00001103",
         "@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": "nrel00000086"
+                "@value": "nrel00001103"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000723",
+        "@id": "urn:nrel_example/nrel00000441",
         "@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": "nrel00000723"
+                "@value": "nrel00000441"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001036",
+        "@id": "urn:nrel_example/nrel00000900",
         "@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://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000462"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001036"
+                "@value": "nrel00000900"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000705",
+        "@id": "urn:nrel_example/nrel00000712",
         "@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": "nrel00000705"
+                "@value": "nrel00000712"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
+        "@id": "urn:nrel_example/nrel00001294",
         "@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#InletConnectionPoint"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "EnumerationKind FlowStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "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": "nrel00001294"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000896",
+        "@id": "urn:nrel_example/nrel00000501",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001049"
+                "@id": "urn:nrel_example/nrel00000236"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@id": "urn:nrel_example/nrel00001165"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000594"
+                "@id": "urn:nrel_example/nrel00000567"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000896"
+                "@value": "nrel00000501"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000131",
+        "@id": "urn:nrel_example/nrel00000200",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -2077,400 +1960,488 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@value": "nrel00000131"
+                "@id": "urn:nrel_example/nrel00000354"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000200"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000421",
+        "@id": "urn:nrel_example/nrel00000618",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000814"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001196"
+                "@id": "urn:nrel_example/nrel00000517"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000879"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001097"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000421"
+                "@value": "nrel00000618"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000936",
+        "@id": "urn:nrel_example/nrel00001234",
         "@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": "nrel00000936"
+                "@value": "nrel00001234"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000926",
+        "@id": "urn:nrel_example/nrel00000305",
         "@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-FlowStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000926"
+                "@value": "nrel00000305"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000971",
+        "@id": "urn:nrel_example/nrel00000179",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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-Air"
+                "@id": "urn:nrel_example/nrel00000178"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000264"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000041"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000097"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000445"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000646"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000696"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000860"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000990"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001031"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001191"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001230"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000971"
+                "@value": "nrel00000179"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000588",
+        "@id": "urn:nrel_example/nrel00000384",
         "@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://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000588"
+                "@value": "nrel00000384"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001238",
+        "@id": "urn:nrel_example/nrel00000159",
         "@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": "nrel00000159"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001112",
+        "@id": "urn:nrel_example/nrel00000689",
         "@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": "nrel00001112"
+                "@value": "nrel00000689"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000159",
+        "@id": "urn:nrel_example/nrel00000727",
         "@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": "nrel00000727"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000747",
+        "@id": "urn:nrel_example/nrel00000421",
         "@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/nrel00001023"
+                "@id": "urn:nrel_example/nrel00000814"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001196"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000710"
+                "@id": "urn:nrel_example/nrel00000879"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001097"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000747"
+                "@value": "nrel00000421"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000829",
+        "@id": "urn:nrel_example/nrel00000320",
         "@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#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000847"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000829"
+                "@value": "nrel00000320"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000583",
+        "@id": "urn:nrel_example/nrel00000405",
         "@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": "nrel00000405"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000012",
+        "@id": "urn:nrel_example/nrel00001021",
         "@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/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000186"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001301"
             }
         ],
-        "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": "nrel00000012"
+                "@value": "nrel00001021"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000250",
+        "@id": "urn:nrel_example/nrel00000299",
         "@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#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000250"
+                "@value": "nrel00000299"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001028",
+        "@id": "urn:nrel_example/nrel00001220",
         "@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": "nrel00001028"
+                "@value": "nrel00001220"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000937",
+        "@id": "urn:nrel_example/nrel00000890",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000937"
+                "@value": "nrel00000890"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000254",
+        "@id": "urn:nrel_example/nrel00000853",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000424"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001274"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000288"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000617"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000254"
+                "@value": "nrel00000853"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000075",
+        "@id": "urn:nrel_example/nrel00000958",
         "@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-Water"
+                "@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#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000208"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000354"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000139"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000823"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000985"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000075"
+                "@value": "nrel00000958"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000682",
+        "@id": "urn:nrel_example/nrel00001165",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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/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": "nrel00000682"
+                "@value": "nrel00001165"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000397",
+        "@id": "urn:nrel_example/nrel00000629",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000255"
+                "@id": "urn:nrel_example/nrel00000318"
             },
             {
-                "@id": "urn:nrel_example/nrel00000908"
+                "@id": "urn:nrel_example/nrel00000393"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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": "nrel00000397"
+                "@value": "nrel00000629"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000074",
+        "@id": "urn:nrel_example/nrel00000948",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2479,131 +2450,160 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000074"
+                "@value": "nrel00000948"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000279",
+        "@id": "urn:nrel_example/nrel00000058",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000760"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000984"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001260"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000279"
+                "@value": "nrel00000058"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001330",
+        "@id": "urn:nrel_example/nrel00000363",
         "@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/nrel00000846"
+                "@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/nrel00000121"
+                "@value": "nrel00000363"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000208",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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": "nrel00000208"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000118",
+        "@id": "urn:nrel_example/nrel00001205",
         "@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/nrel00000504"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000263"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000118"
+                "@value": "nrel00001205"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001051",
+        "@id": "urn:nrel_example/nrel00000394",
         "@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": "nrel00001051"
+                "@value": "nrel00000394"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000040",
+        "@id": "urn:nrel_example/nrel00001090",
         "@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": "nrel00000040"
+                "@value": "nrel00001090"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000771",
+        "@id": "urn:nrel_example/nrel00000854",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000307"
-            },
+                "@id": "urn:nrel_example/nrel00000781"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000699"
+                "@id": "urn:nrel_example/nrel00001027"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000154"
+                "@id": "urn:nrel_example/nrel00000537"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000771"
+                "@value": "nrel00000854"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000153",
+        "@id": "urn:nrel_example/nrel00000539",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -2614,94 +2614,83 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000153"
+                "@value": "nrel00000539"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000208",
+        "@id": "urn:nrel_example/nrel00000266",
         "@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/nrel00000620"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000260"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000208"
+                "@value": "nrel00000266"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000939",
+        "@id": "urn:nrel_example/nrel00000291",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Damper"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000281"
+                "@id": "urn:nrel_example/nrel00000169"
             },
             {
-                "@id": "urn:nrel_example/nrel00000474"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00001009"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000308"
+                "@id": "urn:nrel_example/nrel00000027"
             },
             {
-                "@id": "urn:nrel_example/nrel00001090"
+                "@id": "urn:nrel_example/nrel00000837"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000939"
+                "@value": "nrel00000291"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001299",
+        "@id": "urn:nrel_example/nrel00000044",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00001299"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000898",
-        "@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/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000898"
+                "@value": "nrel00000044"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000306",
+        "@id": "urn:nrel_example/nrel00000595",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2710,120 +2699,93 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000306"
+                "@value": "nrel00000595"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001305",
+        "@id": "urn:nrel_example/nrel00000867",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000399"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000438"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000603"
-            },
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "urn:nrel_example/nrel00000640"
+                "@id": "urn:nrel_example/nrel00000080"
             },
             {
-                "@id": "urn:nrel_example/nrel00000775"
+                "@id": "urn:nrel_example/nrel00000122"
             },
             {
-                "@id": "urn:nrel_example/nrel00000806"
+                "@id": "urn:nrel_example/nrel00000587"
             },
             {
-                "@id": "urn:nrel_example/nrel00000924"
+                "@id": "urn:nrel_example/nrel00000600"
             },
             {
-                "@id": "urn:nrel_example/nrel00000942"
+                "@id": "urn:nrel_example/nrel00000631"
             },
             {
-                "@id": "urn:nrel_example/nrel00000947"
+                "@id": "urn:nrel_example/nrel00000736"
             },
             {
-                "@id": "urn:nrel_example/nrel00001007"
+                "@id": "urn:nrel_example/nrel00000862"
             },
             {
-                "@id": "urn:nrel_example/nrel00001068"
+                "@id": "urn:nrel_example/nrel00001125"
             },
             {
-                "@id": "urn:nrel_example/nrel00001080"
+                "@id": "urn:nrel_example/nrel00001197"
             },
             {
-                "@id": "urn:nrel_example/nrel00001193"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001267"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001305"
+                "@value": "nrel00000867"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000807",
+        "@id": "urn:nrel_example/nrel00000468",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000045"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001157"
-            }
+            "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": "nrel00000807"
+                "@value": "nrel00000468"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001053",
+        "@id": "urn:nrel_example/nrel00001054",
         "@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": "nrel00001053"
+                "@value": "nrel00001054"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001166",
+        "@id": "urn:nrel_example/nrel00000107",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001198"
+                "@id": "urn:nrel_example/nrel00000875"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2833,337 +2795,363 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001166"
+                "@value": "nrel00000107"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000968",
+        "@id": "urn:nrel_example/nrel00001282",
         "@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": "nrel00000968"
+                "@value": "nrel00001282"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000746",
+        "@id": "urn:nrel_example/nrel00000112",
         "@type": [
-            "http://data.ashrae.org/standard223#EAU",
-            "http://data.ashrae.org/standard223#Equipment"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000343"
+                "@id": "urn:nrel_example/nrel00000407"
             },
             {
-                "@id": "urn:nrel_example/nrel00000429"
-            },
+                "@id": "urn:nrel_example/nrel00000621"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000675"
+                "@id": "urn:nrel_example/nrel00000316"
             },
             {
-                "@id": "urn:nrel_example/nrel00000771"
+                "@id": "urn:nrel_example/nrel00000455"
             },
             {
-                "@id": "urn:nrel_example/nrel00001003"
+                "@id": "urn:nrel_example/nrel00000506"
             },
             {
-                "@id": "urn:nrel_example/nrel00001089"
+                "@id": "urn:nrel_example/nrel00000536"
             },
             {
-                "@id": "urn:nrel_example/nrel00001100"
+                "@id": "urn:nrel_example/nrel00000583"
             },
             {
-                "@id": "urn:nrel_example/nrel00001119"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000666"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000050"
+                "@id": "urn:nrel_example/nrel00000721"
             },
             {
-                "@id": "urn:nrel_example/nrel00000134"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000764"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000669"
+                "@id": "urn:nrel_example/nrel00000851"
             },
             {
-                "@id": "urn:nrel_example/nrel00000853"
+                "@id": "urn:nrel_example/nrel00001103"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000746"
+                "@value": "nrel00000112"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000862",
+        "@id": "urn:nrel_example/nrel00000940",
         "@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#InletConnectionPoint"
         ],
-        "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/nrel00000417"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001134"
+                "@id": "urn:nrel_example/nrel00000050"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000862"
+                "@value": "nrel00000940"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000311",
+        "@id": "urn:nrel_example/nrel00000270",
         "@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": "nrel00000311"
+                "@value": "nrel00000270"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000424",
+        "@id": "urn:nrel_example/nrel00000345",
         "@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/nrel00000077"
+                "@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": "nrel00000424"
+                "@value": "nrel00000345"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000837",
+        "@id": "urn:nrel_example/nrel00000250",
         "@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/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": "nrel00000837"
+                "@value": "nrel00000250"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001024",
+        "@id": "urn:nrel_example/nrel00001248",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000208"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000947"
-            }
+            "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": "nrel00001024"
+                "@value": "nrel00001248"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000725",
+        "@id": "urn:nrel_example/nrel00000885",
         "@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/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": "nrel00000725"
+                "@value": "nrel00000885"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000811",
+        "@id": "urn:nrel_example/nrel00000398",
         "@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/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000811"
+                "@value": "nrel00000398"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000636",
+        "@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": "nrel00000636"
+                "@value": "nrel00000681"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000239",
+        "@id": "urn:nrel_example/nrel00000789",
         "@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/Frequency"
+                "@id": "urn:nrel_example/nrel00000361"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000381"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000770"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00001025"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001301"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000442"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000481"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000918"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001238"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001324"
+            }
+        ],
+        "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": "nrel00000239"
+                "@value": "nrel00000789"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000243",
+        "@id": "urn:nrel_example/nrel00000231",
         "@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/Temperature"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@value": "nrel00000231"
+            }
+        ]
+    },
+    {
+        "@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"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000243"
+                "@value": "nrel00000724"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000109",
+        "@id": "urn:nrel_example/nrel00000077",
         "@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/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000424"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000892"
             }
         ],
-        "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-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000109"
+                "@value": "nrel00000077"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000802",
+        "@id": "urn:nrel_example/nrel00000346",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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#hasMedium": [
             {
@@ -3172,350 +3160,344 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000802"
+                "@value": "nrel00000346"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000164",
+        "@id": "urn:nrel_example/nrel00000608",
         "@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/nrel00001265"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000809"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000164"
+                "@value": "nrel00000608"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000945",
+        "@id": "urn:nrel_example/nrel00000662",
         "@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/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000945"
+                "@value": "nrel00000662"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000142",
+        "@id": "urn:nrel_example/nrel00000238",
         "@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/nrel00000948"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000641"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000142"
+                "@value": "nrel00000238"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000385",
+        "@id": "urn:nrel_example/nrel00000680",
         "@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/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": "nrel00000385"
+                "@value": "nrel00000680"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001038",
+        "@id": "urn:nrel_example/nrel00001013",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000676"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000203"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001038"
+                "@value": "nrel00001013"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001282",
+        "@id": "urn:nrel_example/nrel00001144",
         "@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": "nrel00001282"
+                "@value": "nrel00001144"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001176",
+        "@id": "urn:nrel_example/nrel00000756",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000137"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000561"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001095"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000625"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000668"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000810"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001102"
+                "@value": "nrel00000756"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001049",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000046"
-            },
+        "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": "nrel00001176"
+                "@value": "nrel00001049"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000260",
+        "@id": "urn:nrel_example/nrel00000049",
         "@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/nrel00000165"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000175"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000260"
+                "@value": "nrel00000049"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000214",
+        "@id": "urn:nrel_example/nrel00001232",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#HeatingCoil"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000309"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000602"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001303"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000408"
+                "@id": "urn:nrel_example/nrel00000000"
             },
             {
-                "@id": "urn:nrel_example/nrel00000526"
+                "@id": "urn:nrel_example/nrel00000032"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000465"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001284"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000395"
+                "@id": "urn:nrel_example/nrel00000358"
             },
             {
-                "@id": "urn:nrel_example/nrel00001170"
+                "@id": "urn:nrel_example/nrel00001220"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000214"
+                "@value": "nrel00001232"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000773",
+        "@id": "urn:nrel_example/nrel00000896",
         "@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/nrel00001049"
             }
         ],
-        "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/nrel00000594"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000773"
+                "@value": "nrel00000896"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000465",
+        "@id": "urn:nrel_example/nrel00001249",
         "@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": "nrel00000465"
+                "@value": "nrel00001249"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001283",
+        "@id": "urn:nrel_example/nrel00001214",
         "@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": "nrel00001283"
+                "@value": "nrel00001214"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000379",
+        "@id": "urn:nrel_example/nrel00000324",
         "@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/nrel00000961"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000064"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000379"
+                "@value": "nrel00000324"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000262",
+        "@id": "urn:nrel_example/nrel00000833",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000035"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000505"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000729"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000597"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000724"
+                "@id": "urn:nrel_example/nrel00000074"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000070"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000405"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000551"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000980"
-            },
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001011"
+                "@id": "urn:nrel_example/nrel00001027"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00000206"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000262"
+                "@value": "nrel00000833"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000107",
+        "@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/nrel00000875"
+                "@id": "urn:nrel_example/nrel00000265"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000876"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3525,14 +3507,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000107"
+                "@value": "nrel00001321"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001030",
+        "@id": "urn:nrel_example/nrel00001271",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -3541,12 +3523,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001030"
+                "@value": "nrel00001271"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000841",
+        "@id": "urn:nrel_example/nrel00001108",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -3557,65 +3539,65 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000841"
+                "@value": "nrel00001108"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000513",
+        "@id": "urn:nrel_example/nrel00000400",
         "@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/nrel00000305"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000738"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000513"
+                "@value": "nrel00000400"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000059",
+        "@id": "urn:nrel_example/nrel00000939",
         "@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/nrel00000281"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000474"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "nrel00000059"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001248",
-        "@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-RunStatus"
+                "@id": "urn:nrel_example/nrel00000308"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001090"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001248"
+                "@value": "nrel00000939"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000730",
+        "@id": "urn:nrel_example/nrel00000267",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -3626,203 +3608,202 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000730"
+                "@value": "nrel00000267"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001275",
+        "@id": "urn:nrel_example/nrel00000599",
         "@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": "nrel00001275"
+                "@value": "nrel00000599"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001245",
+        "@id": "urn:nrel_example/nrel00000762",
         "@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-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001245"
+                "@value": "nrel00000762"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000547",
+        "@id": "urn:nrel_example/nrel00000026",
         "@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": "nrel00000547"
+                "@value": "nrel00000026"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000653",
+        "@id": "urn:nrel_example/nrel00001192",
         "@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": "nrel00001192"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001258",
+        "@id": "urn:nrel_example/nrel00000720",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000120"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000415"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000349"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000644"
+                "@id": "urn:nrel_example/nrel00000441"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001258"
+                "@value": "nrel00000720"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001190",
+        "@id": "urn:nrel_example/nrel00000417",
         "@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/nrel00000389"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000968"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001190"
+                "@value": "nrel00000417"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000541",
+        "@id": "urn:nrel_example/nrel00000918",
         "@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": "nrel00000541"
+                "@value": "nrel00000918"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000304",
+        "@id": "urn:nrel_example/nrel00000144",
         "@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/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000304"
+                "@value": "nrel00000144"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001144",
+        "@id": "urn:nrel_example/nrel00000041",
         "@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/ElectricCurrent"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001144"
+                "@value": "nrel00000041"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000704",
+        "@id": "urn:nrel_example/nrel00000666",
         "@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/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000704"
+                "@value": "nrel00000666"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001250",
+        "@id": "urn:nrel_example/nrel00001200",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -3833,14 +3814,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001250"
+                "@value": "nrel00001200"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000299",
+        "@id": "urn:nrel_example/nrel00001076",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -3849,320 +3830,301 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000299"
+                "@value": "nrel00001076"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000276",
+        "@id": "urn:nrel_example/nrel00000183",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000276"
+                "@value": "nrel00000183"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000497",
+        "@id": "urn:nrel_example/nrel00000862",
         "@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/nrel00001265"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000219"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000726"
+                "@id": "urn:nrel_example/nrel00000792"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "nrel00000497"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000919",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000026"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000417"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000094"
+                "@id": "urn:nrel_example/nrel00001134"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000919"
+                "@value": "nrel00000862"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001296",
+        "@id": "urn:nrel_example/nrel00000189",
         "@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/nrel00001200"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000241"
+                "@id": "urn:nrel_example/nrel00000163"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001094"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000274"
+                "@id": "urn:nrel_example/nrel00000211"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001296"
+                "@value": "nrel00000189"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000202",
+        "@id": "urn:nrel_example/nrel00001148",
         "@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": "nrel00000202"
+                "@value": "nrel00001148"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000783",
+        "@id": "urn:nrel_example/nrel00000960",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000970"
+                "@id": "urn:nrel_example/nrel00000192"
             },
             {
-                "@id": "urn:nrel_example/nrel00000984"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000494"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000531"
+            },
             {
-                "@value": "nrel00000783"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000265",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000747"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001008"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000265"
+                "@id": "urn:nrel_example/nrel00000635"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001023"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000318",
-        "@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/nrel00000081"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000710"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001138"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000318"
+                "@value": "nrel00000960"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000595",
+        "@id": "urn:nrel_example/nrel00000235",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000413"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000887"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000595"
+                "@id": "urn:nrel_example/nrel00001161"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001311"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000769",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000162"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000231"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000969"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000294"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000054"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000575"
+            },
             {
-                "@value": "nrel00000769"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001196",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000766"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000835"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000951"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001177"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001202"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001216"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001281"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001332"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001196"
+                "@value": "nrel00000235"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001153",
+        "@id": "urn:nrel_example/nrel00000379",
         "@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": "nrel00001153"
+                "@value": "nrel00000379"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000794",
+        "@id": "urn:nrel_example/nrel00000490",
         "@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/nrel00001197"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00001020"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001121"
+                "@id": "urn:nrel_example/nrel00001200"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "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": "nrel00000794"
+                "@value": "nrel00000490"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000240",
+        "@id": "urn:nrel_example/nrel00000886",
         "@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/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": "nrel00000240"
+                "@value": "nrel00000886"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000650",
+        "@id": "urn:nrel_example/nrel00001035",
         "@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": "nrel00000650"
+                "@value": "nrel00001035"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000474",
+        "@id": "urn:nrel_example/nrel00000001",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -4173,77 +4135,51 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000474"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001037",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000722"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000820"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001037"
+                "@value": "nrel00000001"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000372",
+        "@id": "urn:nrel_example/nrel00000256",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000893"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000930"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000372"
+                "@value": "nrel00000256"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001069",
+        "@id": "urn:nrel_example/nrel00000525",
         "@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": "nrel00001069"
+                "@value": "nrel00000525"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001189",
+        "@id": "urn:nrel_example/nrel00000658",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -4252,60 +4188,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001189"
+                "@value": "nrel00000658"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000149",
+        "@id": "urn:nrel_example/nrel00000492",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000211"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000942"
-            }
+            "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": "nrel00000149"
+                "@value": "nrel00000492"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000768",
+        "@id": "urn:nrel_example/nrel00000721",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001047"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001068"
+                "@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": "nrel00000768"
+                "@value": "nrel00000721"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000008",
+        "@id": "urn:nrel_example/nrel00000325",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4321,397 +4246,346 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000008"
+                "@value": "nrel00000325"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000063",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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#hasMedium": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@value": "EnumerationKind Override"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
             {
-                "@value": "nrel00000063"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001116",
+        "@id": "urn:nrel_example/nrel00000825",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001267"
-            }
+            "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/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000184"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001116"
+                "@value": "nrel00000825"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000041",
+        "@id": "urn:nrel_example/nrel00000124",
         "@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": "nrel00000041"
+                "@value": "nrel00000124"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001098",
+        "@id": "urn:nrel_example/nrel00000587",
         "@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/Frequency"
+                "@id": "urn:nrel_example/nrel00000745"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000986"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00001098"
+                "@id": "urn:nrel_example/nrel00000433"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000844"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000587"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000323",
+        "@id": "urn:nrel_example/nrel00000664",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000631"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000241"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000665"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000323"
+                "@value": "nrel00000664"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000395",
+        "@id": "urn:nrel_example/nrel00000984",
         "@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": "nrel00000395"
+                "@value": "nrel00000984"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000534",
+        "@id": "urn:nrel_example/nrel00000861",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000534"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001227",
-        "@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/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001227"
+                "@value": "nrel00000861"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000824",
+        "@id": "urn:nrel_example/nrel00001169",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000386"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000532"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000410"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001248"
+                "@id": "urn:nrel_example/nrel00000635"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000824"
+                "@value": "nrel00001169"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000335",
+        "@id": "urn:nrel_example/nrel00000089",
         "@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": "nrel00000335"
+                "@value": "nrel00000089"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000514",
+        "@id": "urn:nrel_example/nrel00000978",
         "@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": "nrel00000514"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000874",
-        "@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-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000874"
+                "@value": "nrel00000978"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000156",
+        "@id": "urn:nrel_example/nrel00001173",
         "@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/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000156"
+                "@value": "nrel00001173"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000024",
+        "@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": "nrel00000024"
+                "@value": "nrel00001010"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000563",
+        "@id": "urn:nrel_example/nrel00000178",
         "@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#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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000563"
+                "@value": "nrel00000178"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000916",
+        "@id": "urn:nrel_example/nrel00000470",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000600"
+                "@id": "urn:nrel_example/nrel00001267"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@id": "urn:nrel_example/nrel00001165"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001059"
+                "@id": "urn:nrel_example/nrel00000743"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000916"
+                "@value": "nrel00000470"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000284",
+        "@id": "urn:nrel_example/nrel00000212",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000284"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000901",
-        "@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": "nrel00000901"
+                "@value": "nrel00000212"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000125",
+        "@id": "urn:nrel_example/nrel00000068",
         "@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": "nrel00000125"
+                "@value": "nrel00000068"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000676",
+        "@id": "urn:nrel_example/nrel00000763",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -4722,49 +4596,68 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000676"
+                "@value": "nrel00000763"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001073",
+        "@id": "urn:nrel_example/nrel00000982",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000007"
+            },
             {
-                "@value": "nrel00001073"
+                "@id": "urn:nrel_example/nrel00000053"
+            },
+            {
+                "@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"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000342",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000967"
+                "@id": "urn:nrel_example/nrel00000078"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000211"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001221"
+                "@id": "urn:nrel_example/nrel00000034"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001070"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000342"
+                "@value": "nrel00000982"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000081",
+        "@id": "urn:nrel_example/nrel00000498",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4780,39 +4673,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000081"
+                "@value": "nrel00000498"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000440",
+        "@id": "urn:nrel_example/nrel00001317",
         "@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": "nrel00000440"
+                "@value": "nrel00001317"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001323",
+        "@id": "urn:nrel_example/nrel00000794",
         "@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/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": "nrel00001323"
+                "@value": "nrel00000794"
             }
         ]
     },
@@ -4838,31 +4746,55 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000446",
+        "@id": "urn:nrel_example/nrel00000329",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000255"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000892"
+                "@value": "nrel00000329"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000898",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000564"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000446"
+                "@value": "nrel00000898"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000803",
+        "@id": "urn:nrel_example/nrel00000436",
+        "@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": "nrel00000436"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000184",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4878,165 +4810,241 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000803"
+                "@value": "nrel00000184"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000370",
+        "@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/ElectricPower"
+                "@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/KiloW"
+                "@id": "urn:nrel_example/nrel00000410"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001248"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000370"
+                "@value": "nrel00000824"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000199",
+        "@id": "urn:nrel_example/nrel00000448",
         "@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": "nrel00000199"
+                "@value": "nrel00000448"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000333",
+        "@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": "nrel00000333"
+                "@value": "nrel00000672"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000832",
+        "@id": "urn:nrel_example/nrel00000009",
         "@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": "nrel00000832"
+                "@value": "nrel00000009"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000174",
+        "@id": "urn:nrel_example/nrel00000371",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000723"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001275"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@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": "nrel00000174"
+                "@value": "nrel00000371"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000882",
+        "@id": "urn:nrel_example/nrel00000716",
         "@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": "nrel00000882"
+                "@value": "nrel00000716"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001007",
+        "@id": "urn:nrel_example/nrel00000755",
         "@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/nrel00000380"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000491"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000473"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000883"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001007"
+                "@value": "nrel00000755"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001226",
+        "@id": "urn:nrel_example/nrel00000035",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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/nrel00000522"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000824"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@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": "nrel00001226"
+                "@value": "nrel00000035"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000728",
+        "@id": "urn:nrel_example/nrel00000185",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -5052,36 +5060,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000728"
+                "@value": "nrel00000185"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000932",
+        "@id": "urn:nrel_example/nrel00001137",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000207"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001086"
-            }
-        ],
-        "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": "nrel00000932"
+                "@value": "nrel00001137"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000688",
+        "@id": "urn:nrel_example/nrel00001250",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -5092,85 +5092,104 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000688"
+                "@value": "nrel00001250"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000014",
+        "@id": "urn:nrel_example/nrel00000180",
         "@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/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000014"
+                "@value": "nrel00000180"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001276",
+        "@id": "urn:nrel_example/nrel00000552",
         "@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/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000100"
-            },
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000873"
+                "@value": "nrel00000552"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000477",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000141"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000382"
-            },
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000711"
-            },
+                "@value": "nrel00000477"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000647",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000765"
+                "@id": "urn:nrel_example/nrel00000150"
             },
             {
-                "@id": "urn:nrel_example/nrel00000959"
+                "@id": "urn:nrel_example/nrel00000836"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000052"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00000360"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001276"
+                "@value": "nrel00000647"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000947",
+        "@id": "urn:nrel_example/nrel00000846",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5179,150 +5198,118 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000947"
+                "@value": "nrel00000846"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000652",
+        "@id": "urn:nrel_example/nrel00000402",
         "@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/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000499"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000652"
+                "@value": "nrel00000402"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000496",
+        "@id": "urn:nrel_example/nrel00000286",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000970"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001272"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000496"
+                "@value": "nrel00000286"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001195",
+        "@id": "urn:nrel_example/nrel00000968",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000798"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000888"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000910"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001227"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001195"
+                "@value": "nrel00000968"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000962",
+        "@id": "urn:nrel_example/nrel00001226",
         "@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": "nrel00000962"
+                "@value": "nrel00001226"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000626",
+        "@id": "urn:nrel_example/nrel00000399",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000004"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000955"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00001030"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001218"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000626"
+                "@value": "nrel00000399"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000029",
+        "@id": "urn:nrel_example/nrel00000788",
         "@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#EnumeratedActuatableProperty"
         ],
-        "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": "nrel00000029"
+                "@value": "nrel00000788"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000056",
+        "@id": "urn:nrel_example/nrel00001216",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -5338,410 +5325,484 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000056"
+                "@value": "nrel00001216"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001313",
+        "@id": "urn:nrel_example/nrel00000954",
         "@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": "nrel00001313"
+                "@value": "nrel00000954"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000181",
+        "@id": "urn:nrel_example/nrel00000137",
         "@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/nrel00000810"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000623"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000181"
+                "@value": "nrel00000137"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000967",
+        "@id": "urn:nrel_example/nrel00000926",
         "@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": "nrel00000967"
+                "@value": "nrel00000926"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000612",
+        "@id": "urn:nrel_example/nrel00001170",
         "@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": "nrel00000612"
+                "@value": "nrel00001170"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001121",
+        "@id": "urn:nrel_example/nrel00001145",
         "@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/nrel00001197"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000009"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000068"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001121"
+                "@value": "nrel00001145"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000701",
+        "@id": "urn:nrel_example/nrel00000780",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00001025"
+                "@id": "urn:nrel_example/nrel00000179"
             },
             {
-                "@id": "urn:nrel_example/nrel00001203"
+                "@id": "urn:nrel_example/nrel00001015"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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": "nrel00000701"
+                "@value": "nrel00000780"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000562",
+        "@id": "urn:nrel_example/nrel00000368",
         "@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": "nrel00000562"
+                "@value": "nrel00000368"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000217",
+        "@id": "urn:nrel_example/nrel00000843",
         "@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/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000565"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000217"
+                "@value": "nrel00000843"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000503",
+        "@id": "urn:nrel_example/nrel00000667",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "urn:nrel_example/nrel00000207"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001178"
+                "@id": "urn:nrel_example/nrel00000443"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000503"
+                "@value": "nrel00000667"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000757",
+        "@id": "urn:nrel_example/nrel00000219",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000629"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000872"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000006"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000015"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000423"
-            },
+                "@value": "nrel00000219"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000969",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00001112"
+                "@id": "urn:nrel_example/nrel00000736"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000008"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000545"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000999"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001084"
+                "@id": "urn:nrel_example/nrel00000054"
             },
             {
-                "@id": "urn:nrel_example/nrel00001288"
+                "@id": "urn:nrel_example/nrel00000610"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000757"
+                "@value": "nrel00000969"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000532",
+        "@id": "urn:nrel_example/nrel00001098",
         "@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": "nrel00000532"
+                "@value": "nrel00001098"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000200",
+        "@id": "urn:nrel_example/nrel00000829",
         "@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/nrel00000600"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@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": "nrel00000200"
+                "@value": "nrel00000829"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000942",
+        "@id": "urn:nrel_example/nrel00001268",
         "@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": "nrel00001268"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000045",
+        "@id": "urn:nrel_example/nrel00000580",
         "@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"
+                "@id": "urn:nrel_example/nrel00000337"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000741"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001190"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000229"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000389"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000463"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000756"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000968"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001307"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000045"
+                "@value": "nrel00000580"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000820",
+        "@id": "urn:nrel_example/nrel00001208",
         "@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": "nrel00000820"
+                "@value": "nrel00001208"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000264",
+        "@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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000264"
+                "@value": "nrel00000252"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000683",
+        "@id": "urn:nrel_example/nrel00000386",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatExchanger"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000083"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000344"
-            },
+                "@value": "nrel00000386"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001016",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000546"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000183"
-            },
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000189"
-            },
+                "@value": "nrel00001016"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001094",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000271"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000923"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000067"
-            },
+                "@value": "nrel00001094"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001026",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000163"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001094"
+                "@value": "nrel00001026"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001009",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Evaporator"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000683"
+                "@value": "nrel00001009"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000115",
+        "@id": "urn:nrel_example/nrel00001171",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -5752,72 +5813,136 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000115"
+                "@value": "nrel00001171"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000524",
+        "@id": "urn:nrel_example/nrel00001292",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000967"
+                "@id": "urn:nrel_example/nrel00001300"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000865"
+                "@id": "urn:nrel_example/nrel00000147"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000524"
+                "@value": "nrel00001292"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001023",
+        "@id": "urn:nrel_example/nrel00000096",
         "@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": "nrel00001023"
+                "@value": "nrel00000096"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000576",
+        "@id": "urn:nrel_example/nrel00000140",
         "@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": "nrel00000140"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000069",
+        "@id": "urn:nrel_example/nrel00000838",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000399"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000714"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000838"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000859",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:nrel_example/nrel00000080"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000284"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000987"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000859"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000251",
+        "@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": "nrel00000251"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000415",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5826,107 +5951,126 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000069"
+                "@value": "nrel00000415"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000754",
+        "@id": "urn:nrel_example/nrel00001174",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000376"
+                "@id": "urn:nrel_example/nrel00000588"
             },
             {
-                "@id": "urn:nrel_example/nrel00000712"
+                "@id": "urn:nrel_example/nrel00001294"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000044"
+                "@id": "urn:nrel_example/nrel00000020"
             },
             {
-                "@id": "urn:nrel_example/nrel00000180"
+                "@id": "urn:nrel_example/nrel00000029"
             },
             {
-                "@id": "urn:nrel_example/nrel00000310"
+                "@id": "urn:nrel_example/nrel00000257"
             },
             {
-                "@id": "urn:nrel_example/nrel00000370"
+                "@id": "urn:nrel_example/nrel00000295"
             },
             {
-                "@id": "urn:nrel_example/nrel00000377"
+                "@id": "urn:nrel_example/nrel00000569"
             },
             {
-                "@id": "urn:nrel_example/nrel00000639"
+                "@id": "urn:nrel_example/nrel00000650"
             },
             {
-                "@id": "urn:nrel_example/nrel00000868"
+                "@id": "urn:nrel_example/nrel00000796"
             },
             {
-                "@id": "urn:nrel_example/nrel00000997"
+                "@id": "urn:nrel_example/nrel00000857"
             },
             {
-                "@id": "urn:nrel_example/nrel00001010"
+                "@id": "urn:nrel_example/nrel00000890"
             },
             {
-                "@id": "urn:nrel_example/nrel00001257"
+                "@id": "urn:nrel_example/nrel00001076"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001154"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000754"
+                "@value": "nrel00001174"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001138",
+        "@id": "urn:nrel_example/nrel00000889",
+        "@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": "nrel00000889"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000199",
         "@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": "nrel00001138"
+                "@value": "nrel00000199"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000270",
+        "@id": "urn:nrel_example/nrel00001083",
         "@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/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000270"
+                "@value": "nrel00001083"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001172",
+        "@id": "urn:nrel_example/nrel00000069",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5935,174 +6079,220 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001172"
+                "@value": "nrel00000069"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000211",
+        "@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": "nrel00000211"
+                "@value": "nrel00000957"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001082",
+        "@id": "urn:nrel_example/nrel00001196",
         "@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": "nrel00001082"
+                "@value": "nrel00001196"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000965",
+        "@id": "urn:nrel_example/nrel00001180",
         "@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/nrel00000080"
+                "@id": "urn:nrel_example/nrel00000172"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000859"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000005"
+                "@id": "urn:nrel_example/nrel00000885"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001179"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000965"
+                "@value": "nrel00001180"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000628",
+        "@id": "urn:nrel_example/nrel00000020",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "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/PositiveDimensionlessRatio"
             }
         ],
-        "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/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000628"
+                "@value": "nrel00000020"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000982",
+        "@id": "urn:nrel_example/nrel00000531",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000007"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000053"
-            },
+                "@id": "urn:nrel_example/nrel00001023"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000061"
-            },
+                "@id": "urn:nrel_example/nrel00001138"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000254"
-            },
+                "@value": "nrel00000531"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001275",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000446"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000447"
-            },
+                "@value": "nrel00001275"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000902",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000683"
+                "@id": "urn:nrel_example/nrel00000100"
             },
             {
-                "@id": "urn:nrel_example/nrel00000992"
-            },
+                "@id": "urn:nrel_example/nrel00000775"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001087"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000078"
-            },
+                "@value": "nrel00000902"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001056",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000211"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000034"
-            },
+                "@id": "urn:nrel_example/nrel00001265"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001070"
+                "@value": "nrel00001056"
             }
+        ]
+    },
+    {
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+        "@type": [
+            "http://data.ashrae.org/standard223#Class",
+            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+            "http://www.w3.org/ns/shacl#NodeShape"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000982"
+                "@value": "EnumerationKind AlarmStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000286",
+        "@id": "urn:nrel_example/nrel00000800",
         "@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/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": "nrel00000286"
+                "@value": "nrel00000800"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000194",
+        "@id": "urn:nrel_example/nrel00000196",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -6113,379 +6303,410 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000194"
+                "@value": "nrel00000196"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000781",
+        "@id": "urn:nrel_example/nrel00001264",
         "@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": "nrel00000781"
+                "@value": "nrel00001264"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000799",
+        "@id": "urn:nrel_example/nrel00000938",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000217"
+                "@id": "urn:nrel_example/nrel00000073"
             },
             {
-                "@id": "urn:nrel_example/nrel00000613"
+                "@id": "urn:nrel_example/nrel00000324"
             },
             {
-                "@id": "urn:nrel_example/nrel00001292"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000161"
+                "@id": "urn:nrel_example/nrel00000510"
             },
             {
-                "@id": "urn:nrel_example/nrel00001056"
+                "@id": "urn:nrel_example/nrel00001223"
             },
             {
-                "@id": "urn:nrel_example/nrel00001183"
+                "@id": "urn:nrel_example/nrel00001232"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000742"
             },
             {
-                "@id": "urn:nrel_example/nrel00001300"
+                "@id": "urn:nrel_example/nrel00000961"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000147"
+                "@id": "urn:nrel_example/nrel00000064"
             },
             {
-                "@id": "urn:nrel_example/nrel00000565"
+                "@id": "urn:nrel_example/nrel00000332"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000475"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000799"
+                "@value": "nrel00000938"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000263",
+        "@id": "urn:nrel_example/nrel00000619",
         "@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": "nrel00000263"
+                "@value": "nrel00000619"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000141",
+        "@id": "urn:nrel_example/nrel00000221",
         "@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#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#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000141"
+                "@value": "nrel00000221"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000946",
+        "@id": "urn:nrel_example/nrel00000540",
+        "@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": "nrel00000540"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001019",
         "@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": "nrel00000946"
+                "@value": "nrel00001019"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000763",
+        "@id": "urn:nrel_example/nrel00000513",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "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": "nrel00000763"
+                "@value": "nrel00000513"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000804",
+        "@id": "urn:nrel_example/nrel00000350",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000612"
+                "@id": "urn:nrel_example/nrel00000986"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000160"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000895"
+                "@id": "urn:nrel_example/nrel00000225"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000804"
+                "@value": "nrel00000350"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000654",
+        "@id": "urn:nrel_example/nrel00001031",
         "@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": "nrel00000654"
+                "@value": "nrel00001031"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000766",
+        "@id": "urn:nrel_example/nrel00000588",
         "@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/ElectricPower"
+                "@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"
+                "@value": "nrel00000588"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001063",
+        "@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": "nrel00000766"
+                "@value": "nrel00001063"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000633",
+        "@id": "urn:nrel_example/nrel00000070",
         "@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-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000633"
+                "@value": "nrel00000070"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001134",
+        "@id": "urn:nrel_example/nrel00000204",
         "@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": "nrel00001134"
+                "@value": "nrel00000204"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000267",
+        "@id": "urn:nrel_example/nrel00000036",
         "@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/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000267"
+                "@value": "nrel00000036"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000300",
+        "@id": "urn:nrel_example/nrel00000146",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001050"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000518"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000300"
+                "@value": "nrel00000146"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000577",
+        "@id": "urn:nrel_example/nrel00000576",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000891"
-            }
+            "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://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000687"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000577"
+                "@value": "nrel00000576"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000126",
+        "@id": "urn:nrel_example/nrel00000412",
         "@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": "nrel00000126"
+                "@value": "nrel00000412"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000640",
+        "@id": "urn:nrel_example/nrel00000733",
         "@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/nrel00000949"
+            },
+            {
+                "@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": "nrel00000640"
+                "@value": "nrel00000733"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000842",
+        "@id": "urn:nrel_example/nrel00000661",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000939"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000708"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001090"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000842"
+                "@value": "nrel00000661"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001139",
+        "@id": "urn:nrel_example/nrel00001080",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -6494,162 +6715,134 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001139"
+                "@value": "nrel00001080"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000322",
+        "@id": "urn:nrel_example/nrel00001128",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001259"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001168"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000322"
+                "@value": "nrel00001128"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000467",
+        "@id": "urn:nrel_example/nrel00001313",
         "@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": "nrel00000467"
+                "@value": "nrel00001313"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001304",
+        "@id": "urn:nrel_example/nrel00000110",
         "@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-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": "nrel00001304"
+                "@value": "nrel00000110"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001005",
+        "@id": "urn:nrel_example/nrel00000151",
         "@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": "nrel00001005"
+                "@value": "nrel00000151"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001297",
+        "@id": "urn:nrel_example/nrel00000473",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000084"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000230"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000693"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000815"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000881"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001123"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001194"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000373"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000544"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001022"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001297"
+                "@value": "nrel00000473"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000838",
+        "@id": "urn:nrel_example/nrel00000565",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000399"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000714"
+                "@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": "nrel00000838"
+                "@value": "nrel00000565"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000004",
+        "@id": "urn:nrel_example/nrel00000000",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -6660,78 +6853,91 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000004"
+                "@value": "nrel00000000"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001027",
+        "@id": "urn:nrel_example/nrel00000195",
         "@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:nrel_example/nrel00000122"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000206"
-            },
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000537"
+                "@value": "nrel00000195"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000603",
+        "@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": "nrel00001027"
+                "@value": "nrel00000603"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000617",
+        "@id": "urn:nrel_example/nrel00000461",
         "@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:nrel_example/nrel00001198"
             }
         ],
-        "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": "nrel00000617"
+                "@value": "nrel00000461"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000980",
+        "@id": "urn:nrel_example/nrel00000458",
         "@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": "nrel00000980"
+                "@value": "nrel00000458"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000169",
+        "@id": "urn:nrel_example/nrel00000229",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -6742,293 +6948,284 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000169"
+                "@value": "nrel00000229"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000956",
+        "@id": "urn:nrel_example/nrel00000287",
         "@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": "nrel00000956"
+                "@value": "nrel00000287"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000758",
+        "@id": "urn:nrel_example/nrel00000914",
         "@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": "nrel00000914"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001251",
+        "@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": "nrel00000758"
+                "@value": "nrel00001251"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001209",
+        "@id": "urn:nrel_example/nrel00000091",
         "@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/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": "nrel00001209"
+                "@value": "nrel00000091"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000693",
+        "@id": "urn:nrel_example/nrel00000804",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001194"
+                "@id": "urn:nrel_example/nrel00000612"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000373"
+                "@id": "urn:nrel_example/nrel00000895"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000693"
+                "@value": "nrel00000804"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000434",
+        "@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": "nrel00000434"
+                "@value": "nrel00001105"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000599",
+        "@id": "urn:nrel_example/nrel00000442",
         "@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": "nrel00000599"
+                "@value": "nrel00000442"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000275",
+        "@id": "urn:nrel_example/nrel00001139",
         "@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": "nrel00000275"
+                "@value": "nrel00001139"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000670",
+        "@id": "urn:nrel_example/nrel00000906",
         "@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/nrel00000827"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000852"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "urn:nrel_example/nrel00000422"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000855"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000670"
+                "@value": "nrel00000906"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001079",
+        "@id": "urn:nrel_example/nrel00000418",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000966"
+                "@id": "urn:nrel_example/nrel00000485"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000282"
+                "@id": "urn:nrel_example/nrel00000457"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000109"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001079"
+                "@value": "nrel00000418"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000105",
+        "@id": "urn:nrel_example/nrel00001047",
         "@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": "nrel00000105"
+                "@value": "nrel00001047"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000116",
+        "@id": "urn:nrel_example/nrel00000008",
         "@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": "nrel00000116"
+                "@value": "nrel00000008"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000815",
+        "@id": "urn:nrel_example/nrel00000174",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001033"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001229"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000762"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001041"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000815"
+                "@value": "nrel00000174"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000101",
+        "@id": "urn:nrel_example/nrel00001228",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000736"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000969"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001014"
+                "@id": "urn:nrel_example/nrel00000227"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000101"
+                "@value": "nrel00001228"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001202",
+        "@id": "urn:nrel_example/nrel00000558",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -7037,131 +7234,77 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001202"
+                "@value": "nrel00000558"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000128",
+        "@id": "urn:nrel_example/nrel00000216",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000128"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001292",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001300"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000147"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001292"
+                "@value": "nrel00000216"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000774",
+        "@id": "urn:nrel_example/nrel00000338",
         "@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": "nrel00000774"
+                "@value": "nrel00000338"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000055",
+        "@id": "urn:nrel_example/nrel00000624",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000079"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000222"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "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://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001214"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000055"
+                "@value": "nrel00000624"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000352",
+        "@id": "urn:nrel_example/nrel00000563",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -7175,97 +7318,118 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000352"
+                "@value": "nrel00000563"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001061",
+        "@id": "urn:nrel_example/nrel00000354",
         "@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": "nrel00001061"
+                "@value": "nrel00000354"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000561",
+        "@id": "urn:nrel_example/nrel00001125",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000448"
+                "@id": "urn:nrel_example/nrel00001064"
             },
             {
-                "@id": "urn:nrel_example/nrel00000921"
+                "@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/nrel00000106"
+                "@id": "urn:nrel_example/nrel00000002"
             },
             {
-                "@id": "urn:nrel_example/nrel00001054"
+                "@id": "urn:nrel_example/nrel00001280"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000561"
+                "@value": "nrel00001125"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000853",
+        "@id": "urn:nrel_example/nrel00000917",
         "@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/nrel00000948"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000124"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000853"
+                "@value": "nrel00000917"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001183",
+        "@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": "nrel00001183"
+                "@value": "nrel00000975"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000713",
+        "@id": "urn:nrel_example/nrel00000071",
+        "@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": "nrel00000071"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001053",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -7281,78 +7445,83 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000713"
+                "@value": "nrel00001053"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000430",
+        "@id": "urn:nrel_example/nrel00000950",
         "@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": "nrel00000430"
+                "@value": "nrel00000950"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001156",
+        "@id": "urn:nrel_example/nrel00001039",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000198"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000578"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000788"
-            },
+                "@value": "nrel00001039"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000834",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001006"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001156"
+                "@value": "nrel00000834"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000929",
+        "@id": "urn:nrel_example/nrel00001067",
         "@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": "nrel00000929"
+                "@value": "nrel00001067"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000792",
+        "@id": "urn:nrel_example/nrel00001025",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7361,54 +7530,46 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000792"
+                "@value": "nrel00001025"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000759",
+        "@id": "urn:nrel_example/nrel00000511",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "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/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": "nrel00000759"
+                "@value": "nrel00000511"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001122",
+        "@id": "urn:nrel_example/nrel00001096",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000265"
+            },
             {
-                "@value": "nrel00001122"
+                "@id": "urn:nrel_example/nrel00000876"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001135"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000462",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7417,267 +7578,256 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000462"
+                "@value": "nrel00001096"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000033",
+        "@id": "urn:nrel_example/nrel00001084",
         "@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": "nrel00000033"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000350",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000986"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000160"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@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": "nrel00001084"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000857",
+        "@id": "urn:nrel_example/nrel00001221",
         "@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": "nrel00000857"
+                "@value": "nrel00001221"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000293",
+        "@id": "urn:nrel_example/nrel00000435",
         "@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/nrel00001069"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000110"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000419"
+                "@id": "urn:nrel_example/nrel00000142"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000460"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000849"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000917"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000293"
+                "@id": "urn:nrel_example/nrel00000462"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000948"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000601",
-        "@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-RunStatus"
+                "@id": "urn:nrel_example/nrel00000048"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000124"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000641"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000601"
+                "@value": "nrel00000435"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001154",
+        "@id": "urn:nrel_example/nrel00000167",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001154"
+                "@value": "nrel00000167"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000489",
+        "@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": "nrel00000489"
+                "@value": "nrel00001233"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000843",
+        "@id": "urn:nrel_example/nrel00001306",
         "@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": "nrel00001306"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001309",
+        "@id": "urn:nrel_example/nrel00000986",
         "@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-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001309"
+                "@value": "nrel00000986"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000559",
+        "@id": "urn:nrel_example/nrel00000039",
         "@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/nrel00001226"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000933"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000559"
+                "@value": "nrel00000039"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000302",
+        "@id": "urn:nrel_example/nrel00001044",
         "@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/nrel00000364"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@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": "nrel00000302"
+                "@value": "nrel00001044"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000444",
+        "@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-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000444"
+                "@value": "nrel00000198"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000414",
+        "@id": "urn:nrel_example/nrel00000920",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "urn:nrel_example/nrel00000638"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001163"
+                "@id": "urn:nrel_example/nrel00000412"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000414"
+                "@value": "nrel00000920"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000207",
+        "@id": "urn:nrel_example/nrel00000331",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7686,67 +7836,78 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000207"
+                "@value": "nrel00000331"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000638",
+        "@id": "urn:nrel_example/nrel00001217",
         "@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-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000638"
+                "@value": "nrel00001217"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000509",
+        "@id": "urn:nrel_example/nrel00000581",
         "@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-Water"
+                "@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": "nrel00000509"
+                "@value": "nrel00000581"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000592",
+        "@id": "urn:nrel_example/nrel00000637",
         "@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": "nrel00000592"
+                "@value": "nrel00000637"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001301",
+        "@id": "urn:nrel_example/nrel00000439",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7755,213 +7916,282 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001301"
+                "@value": "nrel00000439"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000324",
+        "@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/nrel00000961"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000064"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000324"
+                "@value": "nrel00000614"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000259",
+        "@id": "urn:nrel_example/nrel00000003",
         "@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/Frequency"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000804"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00001038"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001156"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000259"
+                "@id": "urn:nrel_example/nrel00000612"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000676"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000897"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000953"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001102",
-        "@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/nrel00000203"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000895"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001102"
+                "@value": "nrel00000003"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001009",
+        "@id": "urn:nrel_example/nrel00001099",
         "@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": "nrel00001009"
+                "@value": "nrel00001099"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000564",
+        "@id": "urn:nrel_example/nrel00000055",
         "@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/Pressure"
+                "@id": "urn:nrel_example/nrel00000079"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000222"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@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": "nrel00000564"
+                "@value": "nrel00000055"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000303",
+        "@id": "urn:nrel_example/nrel00000120",
         "@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": "nrel00000303"
+                "@value": "nrel00000120"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001118",
+        "@id": "urn:nrel_example/nrel00000484",
         "@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/nrel00000059"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000282"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000113"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001118"
+                "@value": "nrel00000484"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000560",
+        "@id": "urn:nrel_example/nrel00001330",
         "@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/nrel00000846"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000576"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000560"
+                "@value": "nrel00001330"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000313",
+        "@id": "urn:nrel_example/nrel00001115",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Pump"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000296"
+                "@id": "urn:nrel_example/nrel00000014"
             },
             {
-                "@id": "urn:nrel_example/nrel00000428"
+                "@id": "urn:nrel_example/nrel00000237"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000066"
+                "@id": "urn:nrel_example/nrel00000102"
             },
             {
-                "@id": "urn:nrel_example/nrel00001269"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000108"
+            },
             {
-                "@value": "nrel00000313"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000639",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000327"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000338"
+            },
             {
-                "@value": "nrel00000639"
+                "@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": "nrel00001115"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000558",
+        "@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"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001074"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000796",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -7972,12 +8202,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000558"
+                "@value": "nrel00000796"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001307",
+        "@id": "urn:nrel_example/nrel00001118",
+        "@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": "nrel00001118"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000592",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -7993,74 +8244,100 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001307"
+                "@value": "nrel00000592"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000196",
+        "@id": "urn:nrel_example/nrel00000158",
         "@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-RunStatus"
+                "@id": "urn:nrel_example/nrel00000891"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000196"
+                "@value": "nrel00000158"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001232",
+        "@id": "urn:nrel_example/nrel00000129",
+        "@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": "nrel00000129"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001187",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000309"
+                "@id": "urn:nrel_example/nrel00000733"
             },
             {
-                "@id": "urn:nrel_example/nrel00000602"
+                "@id": "urn:nrel_example/nrel00001181"
             },
             {
-                "@id": "urn:nrel_example/nrel00001303"
+                "@id": "urn:nrel_example/nrel00001205"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000000"
+                "@id": "urn:nrel_example/nrel00000504"
             },
             {
-                "@id": "urn:nrel_example/nrel00000032"
+                "@id": "urn:nrel_example/nrel00000595"
             },
             {
-                "@id": "urn:nrel_example/nrel00000465"
+                "@id": "urn:nrel_example/nrel00000705"
             },
             {
-                "@id": "urn:nrel_example/nrel00001284"
+                "@id": "urn:nrel_example/nrel00000737"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000358"
+                "@id": "urn:nrel_example/nrel00000263"
             },
             {
-                "@id": "urn:nrel_example/nrel00001220"
+                "@id": "urn:nrel_example/nrel00000915"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001232"
+                "@value": "nrel00001187"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000827",
+        "@id": "urn:nrel_example/nrel00000798",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -8069,12 +8346,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000827"
+                "@value": "nrel00000798"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001136",
+        "@id": "urn:nrel_example/nrel00001104",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -8085,94 +8362,96 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001136"
+                "@value": "nrel00001104"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000988",
+        "@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": "nrel00000988"
+                "@value": "nrel00000494"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001090",
+        "@id": "urn:nrel_example/nrel00001201",
         "@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": "nrel00001090"
+                "@value": "nrel00001201"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001123",
+        "@id": "urn:nrel_example/nrel00001185",
         "@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-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000414"
+            },
             {
-                "@value": "nrel00001123"
+                "@id": "urn:nrel_example/nrel00000533"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000667"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000755"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001329"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000678",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000931"
+                "@id": "urn:nrel_example/nrel00000207"
             },
             {
-                "@id": "urn:nrel_example/nrel00001256"
+                "@id": "urn:nrel_example/nrel00000864"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000443"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000709"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001163"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000678"
+                "@value": "nrel00001185"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000603",
+        "@id": "urn:nrel_example/nrel00000131",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -8183,390 +8462,286 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000603"
+                "@value": "nrel00000131"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001207",
+        "@id": "urn:nrel_example/nrel00001166",
         "@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#OutletConnectionPoint"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "nrel00001207"
+                "@id": "urn:nrel_example/nrel00001198"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000852",
-        "@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": "nrel00000852"
+                "@value": "nrel00001166"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000289",
+        "@id": "urn:nrel_example/nrel00000333",
         "@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": "nrel00000289"
+                "@value": "nrel00000333"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000232",
+        "@id": "urn:nrel_example/nrel00000275",
         "@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": "nrel00000232"
+                "@value": "nrel00000275"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000102",
+        "@id": "urn:nrel_example/nrel00001318",
         "@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#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00000102"
+                "@id": "urn:nrel_example/nrel00000122"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000204",
-        "@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/nrel00001027"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000335"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000204"
+                "@value": "nrel00001318"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000918",
+        "@id": "urn:nrel_example/nrel00001296",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00000918"
+                "@id": "urn:nrel_example/nrel00001200"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000309",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000000"
+                "@id": "urn:nrel_example/nrel00000241"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001220"
+                "@id": "urn:nrel_example/nrel00000274"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000309"
+                "@value": "nrel00001296"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000307",
+        "@id": "urn:nrel_example/nrel00000395",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000517"
-            }
+            "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": "nrel00000307"
+                "@value": "nrel00000395"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000839",
+        "@id": "urn:nrel_example/nrel00000865",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00001092"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001115"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000356"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000508"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001062"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001189"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000125"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000552"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000654"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001126"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001247"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000839"
+                "@value": "nrel00000865"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000429",
+        "@id": "urn:nrel_example/nrel00001258",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000158"
+                "@id": "urn:nrel_example/nrel00000120"
             },
             {
-                "@id": "urn:nrel_example/nrel00000940"
+                "@id": "urn:nrel_example/nrel00000415"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000250"
+                "@id": "urn:nrel_example/nrel00000349"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000644"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000429"
+                "@value": "nrel00001258"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001285",
+        "@id": "urn:nrel_example/nrel00000115",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001285"
+                "@value": "nrel00000115"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000383",
+        "@id": "urn:nrel_example/nrel00000234",
         "@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/nrel00000430"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000795"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000383"
+                "@value": "nrel00000234"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001199",
+        "@id": "urn:nrel_example/nrel00000714",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000096"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001032"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001224"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001199"
+                "@value": "nrel00000714"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000933",
+        "@id": "urn:nrel_example/nrel00001005",
         "@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": "nrel00000933"
+                "@value": "nrel00001005"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000710",
+        "@id": "urn:nrel_example/nrel00000453",
         "@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/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000710"
+                "@value": "nrel00000453"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000635",
+        "@id": "urn:nrel_example/nrel00001051",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -8577,195 +8752,151 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000635"
+                "@value": "nrel00001051"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000271",
+        "@id": "urn:nrel_example/nrel00000446",
         "@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#Filter"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000271"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001205",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:nrel_example/nrel00000255"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000504"
+                "@id": "urn:nrel_example/nrel00000892"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000263"
+                "@id": "urn:nrel_example/nrel00000564"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001205"
+                "@value": "nrel00000446"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001032",
+        "@id": "urn:nrel_example/nrel00000038",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "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/nrel00000495"
+            },
             {
-                "@value": "nrel00001032"
+                "@id": "urn:nrel_example/nrel00000780"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001187"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000969",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000736"
+                "@id": "urn:nrel_example/nrel00000420"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001270"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000054"
+                "@id": "urn:nrel_example/nrel00000173"
             },
             {
-                "@id": "urn:nrel_example/nrel00000610"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000212"
+            },
             {
-                "@value": "nrel00000969"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001298",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000228"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000329"
+            },
             {
-                "@value": "nrel00001298"
+                "@id": "urn:nrel_example/nrel00000884"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000572",
-        "@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-AlarmStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
             {
-                "@value": "nrel00000572"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001263",
-        "@type": [
-            "http://data.ashrae.org/standard223#Equipment"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001263"
+                "@value": "nrel00000038"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000668",
+        "@id": "urn:nrel_example/nrel00001135",
         "@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": "nrel00000668"
+                "@value": "nrel00001135"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001031",
+        "@id": "urn:nrel_example/nrel00000054",
         "@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": "nrel00001031"
+                "@value": "nrel00000054"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000077",
+        "@id": "urn:nrel_example/nrel00000027",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000424"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000892"
+                "@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"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000077"
+                "@value": "nrel00000027"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000779",
+        "@id": "urn:nrel_example/nrel00000821",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -8774,127 +8905,114 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000779"
+                "@value": "nrel00000821"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000362",
+        "@id": "urn:nrel_example/nrel00000218",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000830"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000839"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001176"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000714"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001020"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000527"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000643"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000812"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001065"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001082"
+                "@value": "nrel00000218"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000474",
+        "@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": "nrel00000362"
+                "@value": "nrel00000474"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001059",
+        "@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": "nrel00001059"
+                "@value": "nrel00000191"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001054",
+        "@id": "urn:nrel_example/nrel00000376",
         "@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": "nrel00001054"
+                "@value": "nrel00000376"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001056",
+        "@id": "urn:nrel_example/nrel00000247",
         "@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/nrel00001105"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001265"
+                "@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": "nrel00001056"
+                "@value": "nrel00000247"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000793",
+        "@id": "urn:nrel_example/nrel00000047",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -8903,270 +9021,279 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000793"
+                "@value": "nrel00000047"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001228",
+        "@id": "urn:nrel_example/nrel00001168",
         "@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://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000227"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001228"
+                "@value": "nrel00001168"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000748",
+        "@id": "urn:nrel_example/nrel00000644",
         "@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": "nrel00000748"
+                "@value": "nrel00000644"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000698",
+        "@id": "urn:nrel_example/nrel00000365",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000580"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000630"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001174"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000698"
+                "@id": "urn:nrel_example/nrel00000001"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000459"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001015",
-        "@type": [
-            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000487"
+                "@id": "urn:nrel_example/nrel00000157"
             },
             {
-                "@id": "urn:nrel_example/nrel00001099"
+                "@id": "urn:nrel_example/nrel00000425"
+            },
+            {
+                "@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/nrel00000024"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             },
             {
-                "@id": "urn:nrel_example/nrel00000979"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001015"
+                "@value": "nrel00000365"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000212",
+        "@id": "urn:nrel_example/nrel00001116",
         "@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:nrel_example/nrel00001267"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000212"
+                "@id": "urn:nrel_example/nrel00001165"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000387",
-        "@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-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000184"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000387"
+                "@value": "nrel00001116"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001060",
+        "@id": "urn:nrel_example/nrel00000596",
         "@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": "nrel00001060"
+                "@value": "nrel00000596"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000955",
+        "@id": "urn:nrel_example/nrel00000983",
         "@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": "nrel00000955"
+                "@value": "nrel00000983"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000464",
+        "@id": "urn:nrel_example/nrel00000187",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000862"
+                "@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#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000441"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001047"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000825"
+                "@id": "urn:nrel_example/nrel00000118"
             },
             {
-                "@id": "urn:nrel_example/nrel00000956"
+                "@id": "urn:nrel_example/nrel00000132"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000758"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000464"
+                "@value": "nrel00000187"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000391",
+        "@id": "urn:nrel_example/nrel00000121",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "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/nrel00000941"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000391"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000469",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000071"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000576"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000469"
+                "@value": "nrel00000121"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001125",
+        "@id": "urn:nrel_example/nrel00000907",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001064"
+                "@id": "urn:nrel_example/nrel00000043"
             },
             {
-                "@id": "urn:nrel_example/nrel00001259"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+                "@id": "urn:nrel_example/nrel00000790"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00001182"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001242"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000002"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001280"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001125"
+                "@value": "nrel00000907"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000627",
+        "@id": "urn:nrel_example/nrel00000302",
         "@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": "nrel00000627"
+                "@value": "nrel00000302"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000023",
+        "@id": "urn:nrel_example/nrel00000382",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -9177,28 +9304,38 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000023"
+                "@value": "nrel00000382"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000257",
+        "@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-AlarmStatus"
+                "@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": "nrel00000257"
+                "@value": "nrel00000515"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000590",
+        "@id": "urn:nrel_example/nrel00000278",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -9209,12 +9346,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000590"
+                "@value": "nrel00000278"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001084",
+        "@id": "urn:nrel_example/nrel00000203",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -9230,128 +9367,157 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001084"
+                "@value": "nrel00000203"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000001",
+        "@id": "urn:nrel_example/nrel00000815",
         "@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/nrel00001033"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001229"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000762"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001041"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000001"
+                "@value": "nrel00000815"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000833",
+        "@id": "urn:nrel_example/nrel00000021",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000074"
+                "@id": "urn:nrel_example/nrel00000339"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001027"
+                "@id": "urn:nrel_example/nrel00001165"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000206"
+                "@id": "urn:nrel_example/nrel00000637"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000833"
+                "@value": "nrel00000021"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000750",
+        "@id": "urn:nrel_example/nrel00000758",
         "@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": "nrel00000758"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000718",
+        "@id": "urn:nrel_example/nrel00000694",
         "@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/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@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": "nrel00000718"
+                "@value": "nrel00000694"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000810",
+        "@id": "urn:nrel_example/nrel00001276",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000757"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000777"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001142"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000810"
+                "@id": "urn:nrel_example/nrel00000100"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000873"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000814",
-        "@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/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": "nrel00000814"
+                "@value": "nrel00001276"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000687",
+        "@id": "urn:nrel_example/nrel00000404",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -9367,65 +9533,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000687"
+                "@value": "nrel00000404"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000009",
+        "@id": "urn:nrel_example/nrel00001003",
         "@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/nrel00000050"
             }
         ],
-        "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/nrel00000853"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000009"
+                "@value": "nrel00001003"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000948",
+        "@id": "urn:nrel_example/nrel00000014",
         "@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": "nrel00000948"
+                "@value": "nrel00000014"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000220",
+        "@id": "urn:nrel_example/nrel00001127",
         "@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": "nrel00000220"
+                "@value": "nrel00001127"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000268",
+        "@id": "urn:nrel_example/nrel00000347",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -9436,54 +9607,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000268"
+                "@value": "nrel00000347"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000255",
+        "@id": "urn:nrel_example/nrel00000311",
         "@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/nrel00000397"
+                "@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": "nrel00000255"
+                "@value": "nrel00000311"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001066",
+        "@id": "urn:nrel_example/nrel00000791",
         "@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": "nrel00001066"
+                "@value": "nrel00000791"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000485",
+        "@id": "urn:nrel_example/nrel00000913",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -9494,250 +9665,241 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000485"
+                "@value": "nrel00000913"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000581",
+        "@id": "urn:nrel_example/nrel00000737",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000223"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000320"
+                "@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/nrel00000403"
-            },
+                "@value": "nrel00000737"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001183",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000850"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000581"
+                "@value": "nrel00001183"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000935",
+        "@id": "urn:nrel_example/nrel00000718",
         "@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": "nrel00000935"
+                "@value": "nrel00000718"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000608",
+        "@id": "urn:nrel_example/nrel00000806",
         "@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/nrel00001265"
+                "@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/nrel00000809"
+                "@value": "nrel00000806"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000004",
+        "@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": "nrel00000608"
+                "@value": "nrel00000004"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000447",
+        "@id": "urn:nrel_example/nrel00001188",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000660"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000899"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001166"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001240"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000199"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000542"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000585"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001061"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000447"
+                "@value": "nrel00001188"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001230",
+        "@id": "urn:nrel_example/nrel00000139",
         "@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": "nrel00001230"
+                "@value": "nrel00000139"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001046",
+        "@id": "urn:nrel_example/nrel00000786",
         "@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": "nrel00001046"
+                "@value": "nrel00000786"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000622",
+        "@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": "nrel00000622"
+                "@value": "nrel00000387"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000050",
+        "@id": "urn:nrel_example/nrel00000505",
         "@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/nrel00000626"
+            },
             {
-                "@value": "nrel00000050"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000210",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00001071"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "urn:nrel_example/nrel00001266"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000210"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000488",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:nrel_example/nrel00000321"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000748"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000983"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001117"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000936"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001236"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000488"
+                "@value": "nrel00000505"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001321",
+        "@id": "urn:nrel_example/nrel00000652",
         "@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/nrel00000265"
-            },
+                "@id": "urn:nrel_example/nrel00001197"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000876"
+                "@id": "urn:nrel_example/nrel00001121"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000499"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001321"
+                "@value": "nrel00000652"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001271",
+        "@id": "urn:nrel_example/nrel00001147",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -9748,377 +9910,372 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001271"
+                "@value": "nrel00001147"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001187",
+        "@id": "urn:nrel_example/nrel00000193",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000733"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001181"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001205"
+                "@id": "urn:nrel_example/nrel00000939"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000504"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000595"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000705"
-            },
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000737"
+                "@id": "urn:nrel_example/nrel00000708"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000263"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000915"
+                "@id": "urn:nrel_example/nrel00000308"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001187"
+                "@value": "nrel00000193"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000734",
+        "@id": "urn:nrel_example/nrel00000842",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000075"
+                "@id": "urn:nrel_example/nrel00000939"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000708"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000740"
+                "@id": "urn:nrel_example/nrel00001090"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000734"
+                "@value": "nrel00000842"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000266",
+        "@id": "urn:nrel_example/nrel00001014",
         "@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/nrel00000620"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000260"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000266"
+                "@value": "nrel00001014"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000147",
+        "@id": "urn:nrel_example/nrel00001272",
         "@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": "nrel00000147"
+                "@value": "nrel00001272"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000580",
+        "@id": "urn:nrel_example/nrel00000007",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000337"
+                "@id": "urn:nrel_example/nrel00000383"
             },
             {
-                "@id": "urn:nrel_example/nrel00000741"
+                "@id": "urn:nrel_example/nrel00000749"
             },
             {
-                "@id": "urn:nrel_example/nrel00001190"
+                "@id": "urn:nrel_example/nrel00001042"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000229"
+                "@id": "urn:nrel_example/nrel00000430"
             },
             {
-                "@id": "urn:nrel_example/nrel00000389"
+                "@id": "urn:nrel_example/nrel00000715"
             },
             {
-                "@id": "urn:nrel_example/nrel00000463"
+                "@id": "urn:nrel_example/nrel00000903"
             },
             {
-                "@id": "urn:nrel_example/nrel00000756"
+                "@id": "urn:nrel_example/nrel00001256"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000968"
+                "@id": "urn:nrel_example/nrel00000795"
             },
             {
-                "@id": "urn:nrel_example/nrel00001307"
+                "@id": "urn:nrel_example/nrel00000946"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000580"
+                "@value": "nrel00000007"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000351",
+        "@id": "urn:nrel_example/nrel00000449",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000172"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000784"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001129"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000351"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001322",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000224"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@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": "nrel00001322"
+                "@value": "nrel00000449"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000542",
+        "@id": "urn:nrel_example/nrel00000156",
         "@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": "nrel00000542"
+                "@value": "nrel00000156"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001274",
+        "@id": "urn:nrel_example/nrel00000685",
         "@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"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001274"
+                "@value": "nrel00000685"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000900",
+        "@id": "urn:nrel_example/nrel00000807",
         "@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/nrel00000045"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001157"
             }
         ],
-        "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": "nrel00000900"
+                "@value": "nrel00000807"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000193",
+        "@id": "urn:nrel_example/nrel00001190",
         "@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/nrel00000389"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000308"
+                "@id": "urn:nrel_example/nrel00000968"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000193"
+                "@value": "nrel00001190"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000519",
+        "@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": "nrel00000519"
+                "@value": "nrel00000732"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001137",
+        "@id": "urn:nrel_example/nrel00000087",
         "@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": "nrel00001137"
+                "@value": "nrel00000087"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001181",
+        "@id": "urn:nrel_example/nrel00000031",
         "@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/nrel00000737"
+                "@id": "urn:nrel_example/nrel00000840"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000858"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000915"
+                "@id": "urn:nrel_example/nrel00000268"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000598"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001181"
+                "@value": "nrel00000031"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000308",
+        "@id": "urn:nrel_example/nrel00000659",
         "@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": "nrel00000308"
+                "@value": "nrel00000659"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000502",
+        "@id": "urn:nrel_example/nrel00000813",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000846"
+                "@id": "urn:nrel_example/nrel00001107"
             },
             {
-                "@id": "urn:nrel_example/nrel00000948"
+                "@id": "urn:nrel_example/nrel00001302"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10128,33 +10285,38 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000502"
+                "@value": "nrel00000813"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000551",
+        "@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/Temperature"
+                "@id": "urn:nrel_example/nrel00001259"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@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": "nrel00000551"
+                "@value": "nrel00000322"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000991",
+        "@id": "urn:nrel_example/nrel00000043",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -10163,324 +10325,322 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00001194"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000991"
+                "@value": "nrel00000043"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000890",
+        "@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/ElectricPower"
+                "@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/KiloW"
+                "@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": "nrel00000890"
+                "@value": "nrel00000061"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000808",
+        "@id": "urn:nrel_example/nrel00000101",
         "@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/nrel00000736"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000808"
+                "@id": "urn:nrel_example/nrel00000969"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000689",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001014"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000689"
+                "@value": "nrel00000101"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000724",
+        "@id": "urn:nrel_example/nrel00000934",
         "@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/nrel00000153"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000302"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000653"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001249"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000724"
+                "@value": "nrel00000934"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000176",
+        "@id": "urn:nrel_example/nrel00000373",
         "@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": "nrel00000176"
+                "@value": "nrel00000373"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000505",
+        "@id": "urn:nrel_example/nrel00000521",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000626"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001071"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001266"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "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#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001117"
+                "@id": "urn:nrel_example/nrel00000354"
             }
         ],
-        "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/nrel00000139"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000505"
+                "@value": "nrel00000521"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000179",
+        "@id": "urn:nrel_example/nrel00000931",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000178"
-            },
+                "@id": "urn:nrel_example/nrel00000678"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000264"
+                "@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/nrel00000041"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000097"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000445"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000646"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000696"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000860"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000990"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001031"
-            },
+                "@value": "nrel00000931"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001146",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001191"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001230"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000179"
+                "@value": "nrel00001146"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000909",
+        "@id": "urn:nrel_example/nrel00000616",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000658"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000282"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000091"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000909"
+                "@value": "nrel00000616"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000282",
+        "@id": "urn:nrel_example/nrel00000605",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000966"
+                "@id": "urn:nrel_example/nrel00000151"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001229"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000091"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000113"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000282"
+                "@value": "nrel00000605"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001048",
+        "@id": "urn:nrel_example/nrel00000197",
         "@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": "nrel00001048"
+                "@value": "nrel00000197"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001315",
+        "@id": "urn:nrel_example/nrel00000928",
         "@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/nrel00000132"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001315"
+                "@value": "nrel00000928"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000493",
+        "@id": "urn:nrel_example/nrel00000584",
         "@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/nrel00000587"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000160"
+                "@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/nrel00000844"
+                "@value": "nrel00000584"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000462",
+        "@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": "nrel00000493"
+                "@value": "nrel00000462"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000860",
+        "@id": "urn:nrel_example/nrel00001060",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -10489,12 +10649,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000860"
+                "@value": "nrel00001060"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000523",
+        "@id": "urn:nrel_example/nrel00000633",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -10505,295 +10665,274 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000523"
+                "@value": "nrel00000633"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000161",
+        "@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-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000161"
+                "@value": "nrel00000699"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001109",
+        "@id": "urn:nrel_example/nrel00000005",
         "@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": "nrel00001109"
+                "@value": "nrel00000005"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001087",
+        "@id": "urn:nrel_example/nrel00000768",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000107"
+                "@id": "urn:nrel_example/nrel00001047"
             },
             {
-                "@id": "urn:nrel_example/nrel00000908"
+                "@id": "urn:nrel_example/nrel00001068"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001213"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001087"
+                "@value": "nrel00000768"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000203",
+        "@id": "urn:nrel_example/nrel00000761",
         "@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": "nrel00000203"
+                "@value": "nrel00000761"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000994",
+        "@id": "urn:nrel_example/nrel00001141",
         "@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": "nrel00000994"
+                "@value": "nrel00001141"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001050",
+        "@id": "urn:nrel_example/nrel00001052",
         "@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#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000967"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001050"
+                "@value": "nrel00001052"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000764",
+        "@id": "urn:nrel_example/nrel00001184",
         "@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": "nrel00000764"
+                "@value": "nrel00001184"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000021",
+        "@id": "urn:nrel_example/nrel00001001",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000339"
-            }
+            "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/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "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": "nrel00000021"
+                "@value": "nrel00001001"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000062",
+        "@id": "urn:nrel_example/nrel00000416",
         "@type": [
             "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000514"
+                "@id": "urn:nrel_example/nrel00000287"
             },
             {
-                "@id": "urn:nrel_example/nrel00000913"
+                "@id": "urn:nrel_example/nrel00000467"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000601"
+                "@id": "urn:nrel_example/nrel00000314"
             },
             {
-                "@id": "urn:nrel_example/nrel00000793"
+                "@id": "urn:nrel_example/nrel00000391"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000062"
+                "@value": "nrel00000416"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000103",
+        "@id": "urn:nrel_example/nrel00000214",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000408"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000526"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000103"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001081",
-        "@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": "nrel00001081"
+                "@value": "nrel00000214"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000296",
+        "@id": "urn:nrel_example/nrel00000816",
         "@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/nrel00001125"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000296"
+                "@id": "urn:nrel_example/nrel00000500"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000798",
-        "@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/nrel00000002"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000798"
+                "@value": "nrel00000816"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000418",
+        "@id": "urn:nrel_example/nrel00000073",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000485"
+                "@id": "urn:nrel_example/nrel00000961"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000457"
+                "@id": "urn:nrel_example/nrel00000332"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000418"
+                "@value": "nrel00000073"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000765",
+        "@id": "urn:nrel_example/nrel00000176",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -10809,165 +10948,192 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000765"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000201",
-        "@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": "nrel00000201"
+                "@value": "nrel00000176"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000753",
+        "@id": "urn:nrel_example/nrel00000776",
         "@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": "nrel00000753"
+                "@value": "nrel00000776"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000184",
+        "@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"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000184"
+                "@value": "nrel00000778"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001167",
+        "@id": "urn:nrel_example/nrel00000810",
         "@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": "nrel00001167"
+                "@value": "nrel00000810"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000805",
+        "@id": "urn:nrel_example/nrel00000935",
         "@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": "nrel00000805"
+                "@value": "nrel00000935"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000543",
+        "@id": "urn:nrel_example/nrel00001305",
         "@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/ElectricPower"
+                "@id": "urn:nrel_example/nrel00000399"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000438"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000603"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000640"
+            },
+            {
+                "@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://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": "nrel00000543"
+                "@value": "nrel00001305"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001252",
+        "@id": "urn:nrel_example/nrel00000223",
         "@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": "nrel00001252"
+                "@value": "nrel00000223"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000697",
+        "@id": "urn:nrel_example/nrel00000722",
         "@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-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@value": "nrel00000722"
             }
+        ]
+    },
+    {
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Default",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+            "http://data.ashrae.org/standard223#EnumerationKind-Override"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000697"
+                "@language": "en",
+                "@value": "AlarmStatus-Alarm"
+            },
+            {
+                "@language": "en",
+                "@value": "Override-Default"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000256",
+        "@id": "urn:nrel_example/nrel00000182",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -10983,22 +11149,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000256"
+                "@value": "nrel00000182"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000998",
+        "@id": "urn:nrel_example/nrel00000082",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000465"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000786"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -11007,294 +11165,267 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000998"
+                "@value": "nrel00000082"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001326",
+        "@id": "urn:nrel_example/nrel00000479",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001326"
+                "@value": "nrel00000479"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000061",
+        "@id": "urn:nrel_example/nrel00001154",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000062"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001199"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000240"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000586"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000964"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001268"
+                "@value": "nrel00001154"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000056",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000498"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000529"
-            },
+                "@id": "http://qudt.org/vocab/unit/V"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000718"
-            },
+                "@value": "nrel00000056"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000544",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001158"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001261"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000061"
+                "@value": "nrel00000544"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000649",
+        "@id": "urn:nrel_example/nrel00000989",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "urn:nrel_example/nrel00000364"
+                "@id": "urn:nrel_example/nrel00000649"
             },
             {
-                "@id": "urn:nrel_example/nrel00000516"
+                "@id": "urn:nrel_example/nrel00000818"
             },
             {
-                "@id": "urn:nrel_example/nrel00000893"
+                "@id": "urn:nrel_example/nrel00000939"
             },
             {
-                "@id": "urn:nrel_example/nrel00001139"
+                "@id": "urn:nrel_example/nrel00000941"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@value": "nrel00000989"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000366",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000182"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001178"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000649"
+                "@value": "nrel00000366"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000944",
+        "@id": "urn:nrel_example/nrel00000937",
         "@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": "nrel00000944"
+                "@value": "nrel00000937"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000425",
+        "@id": "urn:nrel_example/nrel00000349",
         "@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": "nrel00000425"
+                "@value": "nrel00000349"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001182",
+        "@id": "urn:nrel_example/nrel00000437",
         "@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": "nrel00001182"
+                "@value": "nrel00000437"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000112",
+        "@id": "urn:nrel_example/nrel00000526",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000407"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000621"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001103"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000112"
+                "@value": "nrel00000526"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001158",
+        "@id": "urn:nrel_example/nrel00000426",
         "@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/nrel00000971"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001144"
             }
         ],
-        "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": "nrel00001158"
+                "@value": "nrel00000426"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000283",
+        "@id": "urn:nrel_example/nrel00000348",
         "@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": "nrel00000283"
+                "@value": "nrel00000348"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000386",
+        "@id": "urn:nrel_example/nrel00000677",
         "@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": "nrel00000386"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000097",
-        "@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-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000208"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000097"
+                "@value": "nrel00000677"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001272",
+        "@id": "urn:nrel_example/nrel00001163",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11310,147 +11441,139 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001272"
+                "@value": "nrel00001163"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000881",
+        "@id": "urn:nrel_example/nrel00001297",
         "@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/nrel00000084"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000230"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000693"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000815"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000881"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00001123"
+            },
             {
                 "@id": "urn:nrel_example/nrel00001194"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000373"
+            },
             {
                 "@id": "urn:nrel_example/nrel00000544"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001022"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000881"
+                "@value": "nrel00001297"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000875",
+        "@id": "urn:nrel_example/nrel00000410",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000107"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000899"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000875"
-            }
-        ]
-    },
-    {
-        "@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"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001164"
+                "@value": "nrel00000410"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001197",
+        "@id": "urn:nrel_example/nrel00000703",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Damper"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000466"
+                "@id": "urn:nrel_example/nrel00000215"
             },
             {
-                "@id": "urn:nrel_example/nrel00000590"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00001108"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000499"
+                "@id": "urn:nrel_example/nrel00000698"
             },
             {
-                "@id": "urn:nrel_example/nrel00001306"
+                "@id": "urn:nrel_example/nrel00001188"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001197"
+                "@value": "nrel00000703"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001085",
+        "@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/Temperature"
+                "@id": "urn:nrel_example/nrel00000676"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000203"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001085"
+                "@value": "nrel00001038"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000330",
+        "@id": "urn:nrel_example/nrel00000162",
         "@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": "nrel00000330"
+                "@value": "nrel00000162"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000987",
+        "@id": "urn:nrel_example/nrel00000132",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11466,220 +11589,282 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000987"
+                "@value": "nrel00000132"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000238",
+        "@id": "urn:nrel_example/nrel00001092",
         "@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/Frequency"
+                "@id": "urn:nrel_example/nrel00000539"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000763"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000436"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001225"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000238"
+                "@value": "nrel00001092"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000451",
+        "@id": "urn:nrel_example/nrel00000434",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000451"
+                "@value": "nrel00000434"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001008",
+        "@id": "urn:nrel_example/nrel00001331",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000092"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000400"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000454"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000017"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000305"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000797"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001144"
+                "@value": "nrel00001331"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000621",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000275"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000738"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001008"
+                "@value": "nrel00000621"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001171",
+        "@id": "urn:nrel_example/nrel00001195",
         "@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-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000798"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000888"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000910"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001227"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001171"
+                "@value": "nrel00001195"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000711",
+        "@id": "urn:nrel_example/nrel00001326",
         "@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": "nrel00000711"
+                "@value": "nrel00001326"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001311",
+        "@id": "urn:nrel_example/nrel00000145",
         "@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": "nrel00001311"
+                "@value": "nrel00000145"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001099",
+        "@id": "urn:nrel_example/nrel00000992",
         "@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/nrel00000211"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000034"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001099"
+                "@value": "nrel00000992"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000684",
+        "@id": "urn:nrel_example/nrel00000746",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EAU",
+            "http://data.ashrae.org/standard223#Equipment"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@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://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000050"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000134"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000669"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000853"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000684"
+                "@value": "nrel00000746"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000578",
+        "@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": "nrel00000578"
+                "@value": "nrel00000970"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000915",
+        "@id": "urn:nrel_example/nrel00000826",
         "@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-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": "nrel00000826"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001211",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000406"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000574"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000915"
+                "@value": "nrel00001211"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000403",
+        "@id": "urn:nrel_example/nrel00000316",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -11690,70 +11875,73 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000403"
+                "@value": "nrel00000316"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000025",
+        "@id": "urn:nrel_example/nrel00000075",
         "@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": "nrel00000025"
+                "@value": "nrel00000075"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000442",
+        "@id": "urn:nrel_example/nrel00000609",
         "@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/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000442"
+                "@value": "nrel00000609"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000315",
+        "@id": "urn:nrel_example/nrel00000932",
         "@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/nrel00000207"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001086"
             }
         ],
-        "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": "nrel00000315"
+                "@value": "nrel00000932"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000301",
+        "@id": "urn:nrel_example/nrel00000962",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -11764,192 +11952,194 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000301"
+                "@value": "nrel00000962"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000702",
+        "@id": "urn:nrel_example/nrel00000980",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000702"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000539",
-        "@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/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000539"
+                "@value": "nrel00000980"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000979",
+        "@id": "urn:nrel_example/nrel00000774",
         "@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": "nrel00000979"
+                "@value": "nrel00000774"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001168",
+        "@id": "urn:nrel_example/nrel00001126",
         "@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": "nrel00001168"
+                "@value": "nrel00001126"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001039",
+        "@id": "urn:nrel_example/nrel00000420",
         "@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-FlowStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001039"
+                "@value": "nrel00000420"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000139",
+        "@id": "urn:nrel_example/nrel00001061",
         "@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": "nrel00000139"
+                "@value": "nrel00001061"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000228",
+        "@id": "urn:nrel_example/nrel00000553",
         "@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/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000649"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000555"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000930"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000228"
+                "@value": "nrel00000553"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000977",
+        "@id": "urn:nrel_example/nrel00000735",
         "@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": "nrel00000977"
+                "@value": "nrel00000735"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000106",
+        "@id": "urn:nrel_example/nrel00000065",
         "@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://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000106"
+                "@value": "nrel00000065"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000817",
+        "@id": "urn:nrel_example/nrel00001134",
         "@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/nrel00001072"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000684"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000817"
+                "@value": "nrel00001134"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001270",
+        "@id": "urn:nrel_example/nrel00000942",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -11960,49 +12150,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001270"
+                "@value": "nrel00000942"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000068",
+        "@id": "urn:nrel_example/nrel00000641",
         "@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": "nrel00000068"
+                "@value": "nrel00000641"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000382",
+        "@id": "urn:nrel_example/nrel00000294",
         "@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/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000382"
+                "@value": "nrel00000294"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001220",
+        "@id": "urn:nrel_example/nrel00000823",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -12018,28 +12213,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001220"
+                "@value": "nrel00000823"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001201",
+        "@id": "urn:nrel_example/nrel00000341",
         "@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": "nrel00001201"
+                "@value": "nrel00000341"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001147",
+        "@id": "urn:nrel_example/nrel00000871",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -12050,167 +12250,177 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001147"
+                "@value": "nrel00000871"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000032",
+        "@id": "urn:nrel_example/nrel00000583",
         "@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": "nrel00000032"
+                "@value": "nrel00000583"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000404",
+        "@id": "urn:nrel_example/nrel00001240",
         "@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": "nrel00001240"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001095",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000668"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000046"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000404"
+                "@value": "nrel00001095"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000517",
+        "@id": "urn:nrel_example/nrel00000476",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000307"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000618"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "nrel00000476"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000066",
+        "@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": "nrel00000517"
+                "@value": "nrel00000066"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000343",
+        "@id": "urn:nrel_example/nrel00000304",
         "@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/nrel00000134"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000669"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000343"
+                "@value": "nrel00000304"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001100",
+        "@id": "urn:nrel_example/nrel00000099",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatExchanger"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000449"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001258"
+                "@id": "urn:nrel_example/nrel00000297"
             },
             {
-                "@id": "urn:nrel_example/nrel00001263"
+                "@id": "urn:nrel_example/nrel00000541"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000261"
+                "@id": "urn:nrel_example/nrel00000036"
             },
             {
-                "@id": "urn:nrel_example/nrel00000554"
+                "@id": "urn:nrel_example/nrel00000181"
             },
             {
-                "@id": "urn:nrel_example/nrel00000577"
+                "@id": "urn:nrel_example/nrel00000210"
             },
             {
-                "@id": "urn:nrel_example/nrel00001180"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000259"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000687"
+                "@id": "urn:nrel_example/nrel00000304"
             },
             {
-                "@id": "urn:nrel_example/nrel00000885"
+                "@id": "urn:nrel_example/nrel00000375"
             },
             {
-                "@id": "urn:nrel_example/nrel00001179"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:nrel_example/nrel00000609"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Evaporator"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000690"
+            },
             {
-                "@value": "nrel00001100"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000604",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:nrel_example/nrel00000744"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001136"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000954"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001255"
+                "@id": "urn:nrel_example/nrel00001147"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000604"
+                "@value": "nrel00000099"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000236",
+        "@id": "urn:nrel_example/nrel00001301",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -12221,156 +12431,136 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000236"
+                "@value": "nrel00001301"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000690",
+        "@id": "urn:nrel_example/nrel00001265",
         "@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": "nrel00000690"
+                "@value": "nrel00001265"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000616",
+        "@id": "urn:nrel_example/nrel00000927",
         "@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#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": "nrel00000616"
+                "@value": "nrel00000927"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000152",
+        "@id": "urn:nrel_example/nrel00001011",
         "@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/nrel00000354"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000823"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000152"
+                "@value": "nrel00001011"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000000",
+        "@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": "nrel00000000"
+                "@value": "nrel00000864"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000028",
+        "@id": "urn:nrel_example/nrel00000310",
         "@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": "nrel00000028"
+                "@value": "nrel00000310"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000809",
+        "@id": "urn:nrel_example/nrel00000742",
         "@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": "nrel00000809"
+                "@value": "nrel00000742"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000825",
+        "@id": "urn:nrel_example/nrel00000438",
         "@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": "nrel00000825"
+                "@value": "nrel00000438"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000120",
+        "@id": "urn:nrel_example/nrel00000423",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -12379,63 +12569,256 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000120"
+                "@value": "nrel00000423"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000760",
+        "@id": "urn:nrel_example/nrel00000357",
         "@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": "nrel00000760"
+                "@value": "nrel00000357"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001044",
+        "@id": "urn:nrel_example/nrel00000332",
         "@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/nrel00000364"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000332"
+            }
+        ]
+    },
+    {
+        "@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/nrel00000695",
+        "@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": "nrel00000695"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000383",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000430"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000555"
+                "@id": "urn:nrel_example/nrel00000795"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001044"
+                "@value": "nrel00000383"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000818",
+        "@id": "urn:nrel_example/nrel00000406",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00001211"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000406"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000280",
+        "@type": [
+            "http://data.ashrae.org/standard223#FanCoilUnit"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000003"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000055"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000848"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000278"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001157"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000988"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001152"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001204"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001244"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001282"
+            }
+        ],
+        "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": "nrel00000280"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000059",
+        "@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": "nrel00000059"
+            }
+        ]
+    },
+    {
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Overridden",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+            "http://data.ashrae.org/standard223#EnumerationKind-Override"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@language": "en",
+                "@value": "AlarmStatus-Ok"
+            },
+            {
+                "@language": "en",
+                "@value": "Override-Overridden"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000122",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000221"
+                "@id": "urn:nrel_example/nrel00000074"
             },
             {
-                "@id": "urn:nrel_example/nrel00001086"
+                "@id": "urn:nrel_example/nrel00000781"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -12445,97 +12828,128 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000739"
+                "@id": "urn:nrel_example/nrel00000335"
             },
             {
-                "@id": "urn:nrel_example/nrel00001130"
+                "@id": "urn:nrel_example/nrel00001167"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000818"
+                "@value": "nrel00000122"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001148",
+        "@id": "urn:nrel_example/nrel00001112",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@value": "nrel00001112"
+            }
+        ]
+    },
+    {
+        "@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": "nrel00001148"
+                "@value": "nrel00001291"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000891",
+        "@id": "urn:nrel_example/nrel00000669",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000158"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000577"
+                "@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": "nrel00000891"
+                "@value": "nrel00000669"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000405",
+        "@id": "urn:nrel_example/nrel00000785",
         "@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": "nrel00000405"
+                "@value": "nrel00000785"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000586",
+        "@id": "urn:nrel_example/nrel00001058",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000642"
-            }
+            "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": "nrel00000586"
+                "@value": "nrel00001058"
             }
         ]
     },
@@ -12561,231 +12975,243 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000545",
+        "@id": "urn:nrel_example/nrel00000878",
         "@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": "nrel00000545"
+                "@value": "nrel00000878"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000498",
+        "@id": "urn:nrel_example/nrel00000646",
         "@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": "nrel00000498"
+                "@value": "nrel00000646"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000100",
+        "@id": "urn:nrel_example/nrel00000922",
         "@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": "nrel00000100"
+                "@value": "nrel00000922"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001120",
+        "@id": "urn:nrel_example/nrel00000343",
         "@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/nrel00000134"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00000669"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001120"
+                "@value": "nrel00000343"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000320",
+        "@id": "urn:nrel_example/nrel00000769",
         "@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/nrel00000162"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@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": "nrel00000320"
+                "@value": "nrel00000769"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000885",
+        "@id": "urn:nrel_example/nrel00000866",
         "@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": "nrel00000885"
+                "@value": "nrel00000866"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001150",
+        "@id": "urn:nrel_example/nrel00001175",
         "@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": "nrel00001150"
+                "@value": "nrel00001175"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000993",
+        "@id": "urn:nrel_example/nrel00001075",
         "@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": "nrel00000993"
+                "@value": "nrel00001075"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000047",
+        "@id": "urn:nrel_example/nrel00000973",
         "@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": "nrel00000047"
+                "@value": "nrel00000973"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000533",
+        "@id": "urn:nrel_example/nrel00000943",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000188"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000418"
-            },
+                "@id": "http://qudt.org/vocab/unit/KiloW"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001012"
+                "@value": "nrel00000943"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000561",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "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/nrel00000448"
             },
             {
-                "@id": "urn:nrel_example/nrel00001299"
+                "@id": "urn:nrel_example/nrel00000921"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000166"
+                "@id": "urn:nrel_example/nrel00000106"
             },
             {
-                "@id": "urn:nrel_example/nrel00000457"
+                "@id": "urn:nrel_example/nrel00001054"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000533"
+                "@value": "nrel00000561"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000892",
+        "@id": "urn:nrel_example/nrel00000502",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000077"
+                "@id": "urn:nrel_example/nrel00000846"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12795,12 +13221,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000892"
+                "@value": "nrel00000502"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001014",
+        "@id": "urn:nrel_example/nrel00001287",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -12816,77 +13242,62 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001014"
+                "@value": "nrel00001287"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001173",
+        "@id": "urn:nrel_example/nrel00001023",
         "@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#OutletConnectionPoint"
         ],
-        "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": "nrel00001173"
+                "@value": "nrel00001023"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000772",
+        "@id": "urn:nrel_example/nrel00000459",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000167"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000978"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000772"
+                "@value": "nrel00000459"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000706",
+        "@id": "urn:nrel_example/nrel00001129",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000706"
+                "@value": "nrel00001129"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001193",
+        "@id": "urn:nrel_example/nrel00001207",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -12895,33 +13306,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001193"
+                "@value": "nrel00001207"
             }
         ]
     },
-    {
-        "@id": "urn:nrel_example/nrel00000042",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
+    {
+        "@id": "urn:nrel_example/nrel00000507",
+        "@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/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000042"
+                "@value": "nrel00000507"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001203",
+        "@id": "urn:nrel_example/nrel00001311",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -12932,175 +13338,163 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001203"
+                "@value": "nrel00001311"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001080",
+        "@id": "urn:nrel_example/nrel00001179",
         "@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": "nrel00001080"
+                "@value": "nrel00001179"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000928",
+        "@id": "urn:nrel_example/nrel00000972",
         "@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": "nrel00000972"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000090",
+        "@id": "urn:nrel_example/nrel00000372",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000466"
+                "@id": "urn:nrel_example/nrel00000893"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001121"
+                "@id": "urn:nrel_example/nrel00000553"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000068"
+                "@id": "urn:nrel_example/nrel00000930"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000090"
+                "@value": "nrel00000372"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000312",
+        "@id": "urn:nrel_example/nrel00000148",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000869"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001228"
+                "@id": "urn:nrel_example/nrel00001046"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000047"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000196"
+                "@id": "urn:nrel_example/nrel00001067"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000312"
+                "@value": "nrel00000148"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000066",
+        "@id": "urn:nrel_example/nrel00000545",
         "@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": "nrel00000066"
+                "@value": "nrel00000545"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000484",
+        "@id": "urn:nrel_example/nrel00000888",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000059"
-            }
-        ],
-        "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/nrel00000113"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000484"
+                "@value": "nrel00000888"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000205",
+        "@id": "urn:nrel_example/nrel00001304",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000025"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000076"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000194"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000299"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000205"
+                "@value": "nrel00001304"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001198",
+        "@id": "urn:nrel_example/nrel00000905",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000461"
+                "@id": "urn:nrel_example/nrel00000444"
             },
             {
-                "@id": "urn:nrel_example/nrel00001166"
+                "@id": "urn:nrel_example/nrel00000597"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13110,22 +13504,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001198"
+                "@value": "nrel00000905"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000995",
+        "@id": "urn:nrel_example/nrel00001111",
         "@type": [
-            "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#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13134,250 +13520,276 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000995"
+                "@value": "nrel00001111"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001055",
+        "@id": "urn:nrel_example/nrel00000063",
         "@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#OutletConnectionPoint"
         ],
-        "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": "nrel00001055"
+                "@value": "nrel00000063"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001331",
+        "@id": "urn:nrel_example/nrel00000757",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "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-RunStatus"
+                "@id": "urn:nrel_example/nrel00000629"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000872"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00001331"
+                "@id": "urn:nrel_example/nrel00000006"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000015"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000423"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001112"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000145",
-        "@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/nrel00000008"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000545"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000999"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001084"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001288"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000145"
+                "@value": "nrel00000757"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000298",
+        "@id": "urn:nrel_example/nrel00000620",
         "@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": "nrel00000298"
+                "@value": "nrel00000620"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000348",
+        "@id": "urn:nrel_example/nrel00000542",
         "@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": "nrel00000348"
+                "@value": "nrel00000542"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000492",
+        "@id": "urn:nrel_example/nrel00001210",
         "@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": "nrel00000492"
+                "@value": "nrel00001210"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000482",
+        "@id": "urn:nrel_example/nrel00000519",
         "@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/ElectricCurrent"
+            }
         ],
-        "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/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000482"
+                "@value": "nrel00000519"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000473",
+        "@id": "urn:nrel_example/nrel00000509",
         "@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": "nrel00000473"
+                "@value": "nrel00000509"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000367",
+        "@id": "urn:nrel_example/nrel00001223",
         "@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/nrel00000219"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000786"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "urn:nrel_example/nrel00001149"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000956"
+                "@id": "urn:nrel_example/nrel00000363"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000489"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000367"
+                "@value": "nrel00001223"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000071",
+        "@id": "urn:nrel_example/nrel00000602",
         "@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/nrel00000032"
             }
         ],
-        "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/nrel00000358"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000071"
+                "@value": "nrel00000602"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000183",
+        "@id": "urn:nrel_example/nrel00000884",
         "@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": "nrel00000183"
+                "@value": "nrel00000884"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000570",
+        "@id": "urn:nrel_example/nrel00000084",
         "@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/nrel00000133"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000593"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000772"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000570"
+                "@id": "urn:nrel_example/nrel00000151"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000167"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000432"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000991"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000463",
-        "@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-Water"
+                "@id": "urn:nrel_example/nrel00000978"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001235"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000463"
+                "@value": "nrel00000084"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000222",
+        "@id": "urn:nrel_example/nrel00001189",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -13388,44 +13800,57 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000222"
+                "@value": "nrel00001189"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000548",
+        "@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-RunStatus"
+                "@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": "nrel00000548"
+                "@value": "nrel00000615"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000436",
+        "@id": "urn:nrel_example/nrel00001307",
         "@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": "nrel00000436"
+                "@value": "nrel00001307"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001152",
+        "@id": "urn:nrel_example/nrel00000141",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -13441,125 +13866,136 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001152"
+                "@value": "nrel00000141"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000150",
+        "@id": "urn:nrel_example/nrel00001081",
         "@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-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000150"
+                "@value": "nrel00001081"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001216",
+        "@id": "urn:nrel_example/nrel00000362",
         "@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/ElectricPotential"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000830"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00000839"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001176"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00001216"
+                "@id": "urn:nrel_example/nrel00000714"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001020"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000908",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000397"
+                "@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://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": "nrel00000908"
+                "@value": "nrel00000362"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001041",
+        "@id": "urn:nrel_example/nrel00000480",
         "@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/nrel00000220"
+            },
             {
-                "@value": "nrel00001041"
+                "@id": "urn:nrel_example/nrel00000420"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000167",
-        "@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": "nrel00000167"
+                "@value": "nrel00000480"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001280",
+        "@id": "urn:nrel_example/nrel00001263",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "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/Temperature"
+                "@value": "nrel00001263"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000201",
+        "@type": [
+            "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": "nrel00001280"
+                "@value": "nrel00000201"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000252",
+        "@id": "urn:nrel_example/nrel00000236",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13568,12 +14004,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000252"
+                "@value": "nrel00000236"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001141",
+        "@id": "urn:nrel_example/nrel00001159",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -13584,394 +14020,413 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001141"
+                "@value": "nrel00001159"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000887",
+        "@id": "urn:nrel_example/nrel00000344",
         "@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/nrel00001311"
+                "@id": "urn:nrel_example/nrel00000944"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001210"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000575"
+                "@id": "urn:nrel_example/nrel00000145"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000170"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000174"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000384"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000456"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000468"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000937"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001081"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001120"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001246"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000887"
+                "@value": "nrel00000344"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000721",
+        "@id": "urn:nrel_example/nrel00000688",
         "@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": "nrel00000688"
+            }
+        ]
+    },
+    {
+        "@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"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000721"
+                "@value": "nrel00000981"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000234",
+        "@id": "urn:nrel_example/nrel00000496",
         "@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/nrel00000970"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00001272"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000234"
+                "@value": "nrel00000496"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000165",
+        "@id": "urn:nrel_example/nrel00000704",
         "@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": "nrel00000165"
+                "@value": "nrel00000704"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001162",
+        "@id": "urn:nrel_example/nrel00001078",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000069"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000482"
+                "@id": "urn:nrel_example/nrel00001077"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000111"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001319"
+                "@id": "urn:nrel_example/nrel00000272"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001162"
+                "@value": "nrel00001078"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000535",
+        "@id": "urn:nrel_example/nrel00000604",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000691"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000699"
+                "@id": "urn:nrel_example/nrel00001136"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001255"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000535"
+                "@value": "nrel00000604"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000458",
+        "@id": "urn:nrel_example/nrel00000248",
         "@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#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": "nrel00000458"
+                "@value": "nrel00000248"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000507",
+        "@id": "urn:nrel_example/nrel00000411",
         "@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": "nrel00000507"
+                "@value": "nrel00000411"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000027",
+        "@id": "urn:nrel_example/nrel00000244",
         "@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-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000027"
+                "@value": "nrel00000244"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000410",
+        "@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-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000410"
+                "@value": "nrel00000852"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000390",
+        "@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": "nrel00000390"
+                "@value": "nrel00000407"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000856",
+        "@id": "urn:nrel_example/nrel00000337",
         "@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/nrel00000045"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000469"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000969"
+                "@id": "urn:nrel_example/nrel00000509"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000610"
+                "@id": "urn:nrel_example/nrel00000119"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000671"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000856"
+                "@value": "nrel00000337"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000143",
+        "@id": "urn:nrel_example/nrel00001245",
         "@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-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": "nrel00000143"
+                "@value": "nrel00001245"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000007",
+        "@id": "urn:nrel_example/nrel00000150",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000383"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000749"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001042"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000430"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000715"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000903"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001256"
+                "@value": "nrel00000150"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000674",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000795"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000946"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000007"
+                "@value": "nrel00000674"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000745",
+        "@id": "urn:nrel_example/nrel00000979",
         "@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": "nrel00000745"
+                "@value": "nrel00000979"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000669",
+        "@id": "urn:nrel_example/nrel00000543",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000669"
+                "@value": "nrel00000543"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001242",
+        "@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": "nrel00001242"
+                "@value": "nrel00000006"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000230",
+        "@id": "urn:nrel_example/nrel00000282",
         "@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/nrel00001194"
+                "@id": "urn:nrel_example/nrel00000966"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001022"
+                "@id": "urn:nrel_example/nrel00000091"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000113"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000230"
+                "@value": "nrel00000282"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000290",
+        "@id": "urn:nrel_example/nrel00001299",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13980,14 +14435,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000290"
+                "@value": "nrel00001299"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000879",
+        "@id": "urn:nrel_example/nrel00000997",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -13996,83 +14451,84 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000879"
+                "@value": "nrel00000997"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000365",
+        "@id": "urn:nrel_example/nrel00001156",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000580"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000630"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001174"
-            }
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000001"
+                "@id": "urn:nrel_example/nrel00000198"
             },
             {
-                "@id": "urn:nrel_example/nrel00000459"
+                "@id": "urn:nrel_example/nrel00000578"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000157"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000425"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000672"
+                "@id": "urn:nrel_example/nrel00000788"
             },
             {
-                "@id": "urn:nrel_example/nrel00001109"
-            },
+                "@id": "urn:nrel_example/nrel00001006"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001314"
+                "@value": "nrel00001156"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000711",
+        "@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/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000365"
+                "@value": "nrel00000711"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000894",
+        "@id": "urn:nrel_example/nrel00000114",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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/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": "nrel00000894"
+                "@value": "nrel00000114"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000157",
+        "@id": "urn:nrel_example/nrel00000067",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -14088,160 +14544,197 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000157"
+                "@value": "nrel00000067"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000412",
+        "@id": "urn:nrel_example/nrel00000194",
         "@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/Temperature"
+                "@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/DEG_C"
+                "@value": "nrel00000194"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001323",
+        "@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": "nrel00000412"
+                "@value": "nrel00001323"
             }
         ]
     },
     {
-        "@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/nrel00000726",
+        "@id": "urn:nrel_example/nrel00000118",
         "@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": "nrel00000726"
+                "@value": "nrel00000118"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001058",
+        "@id": "urn:nrel_example/nrel00001285",
         "@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://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000207"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001058"
+                "@value": "nrel00001285"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000515",
+        "@id": "urn:nrel_example/nrel00000868",
         "@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/nrel00000745"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000160"
+                "@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/nrel00001286"
+                "@value": "nrel00000868"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000377",
+        "@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": "nrel00000515"
+                "@value": "nrel00000377"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001072",
+        "@id": "urn:nrel_example/nrel00001006",
         "@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": "nrel00001072"
+                "@value": "nrel00001006"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000631",
+        "@id": "urn:nrel_example/nrel00000698",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000138"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001200"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@value": "nrel00000698"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000409",
+        "@type": [
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000665"
-            },
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "urn:nrel_example/nrel00001085"
+                "@id": "urn:nrel_example/nrel00000966"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000631"
+                "@value": "nrel00000409"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000223",
+        "@id": "urn:nrel_example/nrel00000715",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -14252,14 +14745,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000223"
+                "@value": "nrel00000715"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000924",
+        "@id": "urn:nrel_example/nrel00000512",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14268,37 +14761,37 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000924"
+                "@value": "nrel00000512"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000961",
+        "@id": "urn:nrel_example/nrel00000016",
         "@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": "nrel00000961"
+                "@value": "nrel00000016"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000600",
+        "@id": "urn:nrel_example/nrel00000080",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000439"
+                "@id": "urn:nrel_example/nrel00000220"
             },
             {
-                "@id": "urn:nrel_example/nrel00001049"
+                "@id": "urn:nrel_example/nrel00001105"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -14308,62 +14801,111 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000847"
+                "@id": "urn:nrel_example/nrel00000005"
             },
             {
-                "@id": "urn:nrel_example/nrel00001059"
+                "@id": "urn:nrel_example/nrel00000319"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000600"
+                "@value": "nrel00000080"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000664",
+        "@id": "urn:nrel_example/nrel00001071",
         "@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/nrel00000748"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00001236"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000664"
+                "@value": "nrel00001071"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000067",
+        "@id": "urn:nrel_example/nrel00000495",
         "@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/Temperature"
+                "@id": "urn:nrel_example/nrel00000331"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001111"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@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"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001039"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000067"
+                "@value": "nrel00000495"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000571",
+        "@id": "urn:nrel_example/nrel00000249",
+        "@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": "nrel00000249"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000175",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -14379,147 +14921,90 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000571"
+                "@value": "nrel00000175"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000233",
+        "@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/nrel00000226"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000568"
+                "@id": "urn:nrel_example/nrel00000291"
             },
             {
-                "@id": "urn:nrel_example/nrel00001291"
+                "@id": "urn:nrel_example/nrel00000496"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000512"
+                "@id": "urn:nrel_example/nrel00000970"
             },
             {
-                "@id": "urn:nrel_example/nrel00001208"
+                "@id": "urn:nrel_example/nrel00001207"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000115"
+                "@id": "urn:nrel_example/nrel00000283"
             },
             {
-                "@id": "urn:nrel_example/nrel00000348"
+                "@id": "urn:nrel_example/nrel00000651"
             },
             {
-                "@id": "urn:nrel_example/nrel00000451"
+                "@id": "urn:nrel_example/nrel00000661"
             },
             {
-                "@id": "urn:nrel_example/nrel00001002"
+                "@id": "urn:nrel_example/nrel00000674"
             },
             {
-                "@id": "urn:nrel_example/nrel00001212"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000811"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000233"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001303",
-        "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000622"
+                "@id": "urn:nrel_example/nrel00000963"
             },
             {
-                "@id": "urn:nrel_example/nrel00000682"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000286"
+                "@id": "urn:nrel_example/nrel00001016"
             },
             {
-                "@id": "urn:nrel_example/nrel00000679"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001303"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000180",
-        "@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": "urn:nrel_example/nrel00001132"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00001272"
+            },
             {
-                "@value": "nrel00000180"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000380",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00001273"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001331"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000380"
+                "@value": "nrel00001308"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000644",
+        "@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-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000644"
+                "@value": "nrel00001065"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000621",
+        "@id": "urn:nrel_example/nrel00000264",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -14530,44 +15015,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000621"
+                "@value": "nrel00000264"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001068",
+        "@id": "urn:nrel_example/nrel00000706",
         "@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": "nrel00001068"
+                "@value": "nrel00000706"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000671",
+        "@id": "urn:nrel_example/nrel00001032",
         "@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": "nrel00000671"
+                "@value": "nrel00001032"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000556",
+        "@id": "urn:nrel_example/nrel00000253",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -14583,73 +15073,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000556"
+                "@value": "nrel00000253"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000328",
+        "@id": "urn:nrel_example/nrel00001082",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000306"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001262"
+                "@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": "nrel00000328"
+                "@value": "nrel00001082"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000216",
+        "@id": "urn:nrel_example/nrel00000385",
         "@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": "nrel00000216"
+                "@value": "nrel00000385"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000883",
+        "@id": "urn:nrel_example/nrel00001037",
         "@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/nrel00000722"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000820"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000883"
+                "@value": "nrel00001037"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000368",
+        "@id": "urn:nrel_example/nrel00000738",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -14665,233 +15152,265 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000368"
+                "@value": "nrel00000738"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000162",
+        "@id": "urn:nrel_example/nrel00001312",
         "@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/nrel00000818"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000162"
+                "@id": "urn:nrel_example/nrel00000336"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000401",
-        "@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-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00001130"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000401"
+                "@value": "nrel00001312"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000672",
+        "@id": "urn:nrel_example/nrel00000845",
         "@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": "nrel00000672"
+                "@value": "nrel00000845"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001246",
+        "@id": "urn:nrel_example/nrel00000455",
         "@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/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001246"
+                "@value": "nrel00000455"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000985",
+        "@id": "urn:nrel_example/nrel00001028",
         "@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/PositiveDimensionlessRatio"
             }
         ],
         "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": "nrel00000985"
+                "@value": "nrel00001028"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000569",
+        "@id": "urn:nrel_example/nrel00001133",
         "@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/ElectricPotential"
+                "@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/V"
+                "@value": "nrel00001133"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000487",
+        "@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": "nrel00000569"
+                "@value": "nrel00000487"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001231",
+        "@id": "urn:nrel_example/nrel00000342",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000366"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000655"
+                "@id": "urn:nrel_example/nrel00000967"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000695"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001271"
+                "@id": "urn:nrel_example/nrel00001221"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001231"
+                "@value": "nrel00000342"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001174",
+        "@id": "urn:nrel_example/nrel00001254",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000588"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001294"
-            }
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000020"
-            },
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000029"
+                "@id": "urn:nrel_example/nrel00000342"
             },
             {
-                "@id": "urn:nrel_example/nrel00000257"
+                "@id": "urn:nrel_example/nrel00000524"
             },
             {
-                "@id": "urn:nrel_example/nrel00000295"
+                "@id": "urn:nrel_example/nrel00000686"
             },
             {
-                "@id": "urn:nrel_example/nrel00000569"
+                "@id": "urn:nrel_example/nrel00000782"
             },
             {
-                "@id": "urn:nrel_example/nrel00000650"
-            },
+                "@id": "urn:nrel_example/nrel00001231"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000796"
+                "@id": "urn:nrel_example/nrel00000688"
             },
             {
-                "@id": "urn:nrel_example/nrel00000857"
-            },
+                "@id": "urn:nrel_example/nrel00000967"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000890"
+                "@id": "urn:nrel_example/nrel00000176"
             },
             {
-                "@id": "urn:nrel_example/nrel00001076"
+                "@id": "urn:nrel_example/nrel00000865"
             },
             {
-                "@id": "urn:nrel_example/nrel00001154"
+                "@id": "urn:nrel_example/nrel00001221"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001174"
+                "@value": "nrel00001254"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000455",
+        "@id": "urn:nrel_example/nrel00000687",
         "@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": "nrel00000455"
+                "@value": "nrel00000687"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000438",
+        "@id": "urn:nrel_example/nrel00000532",
         "@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": "nrel00000532"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000336",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@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": "nrel00000336"
+            }
+        ]
+    },
+    {
+        "@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"
@@ -14899,21 +15418,21 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000438"
+                "@value": "nrel00001034"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000088",
+        "@id": "urn:nrel_example/nrel00000759",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000986"
+                "@id": "urn:nrel_example/nrel00000025"
             },
             {
-                "@id": "urn:nrel_example/nrel00001194"
+                "@id": "urn:nrel_example/nrel00000040"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14923,163 +15442,160 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000088"
+                "@value": "nrel00000759"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000437",
+        "@id": "urn:nrel_example/nrel00000536",
         "@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": "nrel00000437"
+                "@value": "nrel00000536"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000016",
+        "@id": "urn:nrel_example/nrel00000517",
         "@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"
+                "@id": "urn:nrel_example/nrel00000307"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000618"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000016"
+                "@value": "nrel00000517"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000384",
+        "@id": "urn:nrel_example/nrel00000990",
         "@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": "nrel00000384"
+                "@value": "nrel00000990"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001149",
+        "@id": "urn:nrel_example/nrel00000259",
         "@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://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000742"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001149"
+                "@value": "nrel00000259"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000973",
+        "@id": "urn:nrel_example/nrel00000817",
         "@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/nrel00001072"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000684"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000973"
+                "@value": "nrel00000817"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000743",
+        "@id": "urn:nrel_example/nrel00000566",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000743"
+                "@value": "nrel00000566"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000314",
+        "@id": "urn:nrel_example/nrel00000835",
         "@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#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000314"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001314",
-        "@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/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001314"
+                "@value": "nrel00000835"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000699",
+        "@id": "urn:nrel_example/nrel00000808",
         "@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"
@@ -15087,137 +15603,72 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000699"
+                "@value": "nrel00000808"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000525",
+        "@id": "urn:nrel_example/nrel00000440",
         "@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": "nrel00000525"
+                "@value": "nrel00000440"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000341",
+        "@id": "urn:nrel_example/nrel00000562",
         "@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/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000341"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000481",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000481"
+                "@value": "nrel00000562"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000830",
+        "@id": "urn:nrel_example/nrel00000537",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000252"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001159"
-            }
-        ],
-        "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"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000977"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001019"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001048"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001217"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000830"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001200",
-        "@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/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001200"
+                "@value": "nrel00000537"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000428",
+        "@id": "urn:nrel_example/nrel00000237",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -15226,171 +15677,191 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000428"
+                "@value": "nrel00000237"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001243",
+        "@id": "urn:nrel_example/nrel00000564",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000281"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000708"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000866"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001243"
+                "@value": "nrel00000564"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000796",
+        "@id": "urn:nrel_example/nrel00000547",
         "@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": "nrel00000796"
+                "@value": "nrel00000547"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000388",
+        "@id": "urn:nrel_example/nrel00000740",
         "@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": "nrel00000388"
+                "@value": "nrel00000740"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000755",
+        "@id": "urn:nrel_example/nrel00000022",
         "@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/nrel00000380"
+                "@id": "urn:nrel_example/nrel00000190"
             },
             {
-                "@id": "urn:nrel_example/nrel00000491"
+                "@id": "urn:nrel_example/nrel00000366"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000473"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000883"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000755"
+                "@value": "nrel00000022"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000686",
+        "@id": "http://data.ashrae.org/standard223#HeatRecoveryCoil",
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Coil"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000692",
         "@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/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000176"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000686"
+                "@value": "nrel00000692"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000237",
+        "@id": "urn:nrel_example/nrel00000933",
         "@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": "nrel00000237"
+                "@value": "nrel00000933"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001095",
+        "@id": "urn:nrel_example/nrel00001066",
         "@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/nrel00000668"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000046"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001095"
+                "@value": "nrel00001066"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001088",
+        "@id": "urn:nrel_example/nrel00000797",
         "@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://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00001023"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001088"
+                "@value": "nrel00000797"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000248",
+        "@id": "urn:nrel_example/nrel00001164",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -15401,405 +15872,440 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000248"
+                "@value": "nrel00001164"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000137",
+        "@id": "urn:nrel_example/nrel00000533",
         "@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/nrel00000810"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000188"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000623"
+                "@id": "urn:nrel_example/nrel00000418"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001012"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000137"
+                "@id": "urn:nrel_example/nrel00000485"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000579"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001285"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001299"
             }
-        ]
-    },
-    {
-        "@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/nrel00000166"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000457"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001132"
+                "@value": "nrel00000533"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000655",
+        "@id": "urn:nrel_example/nrel00000233",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000226"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000568"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001291"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000688"
+                "@id": "urn:nrel_example/nrel00000512"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001208"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000655"
+                "@id": "urn:nrel_example/nrel00000115"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000348"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000451"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001002"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001212"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001327",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "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": "nrel00001327"
+                "@value": "nrel00000233"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000905",
+        "@id": "urn:nrel_example/nrel00001246",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000444"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000597"
+                "@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": "nrel00000905"
+                "@value": "nrel00001246"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000786",
+        "@id": "urn:nrel_example/nrel00000748",
         "@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": "nrel00000786"
+                "@value": "nrel00000748"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000038",
+        "@id": "urn:nrel_example/nrel00000848",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000495"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000780"
+                "@id": "urn:nrel_example/nrel00000581"
             },
             {
-                "@id": "urn:nrel_example/nrel00001187"
+                "@id": "urn:nrel_example/nrel00000754"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000420"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001270"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000173"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000212"
+                "@id": "urn:nrel_example/nrel00000146"
             },
             {
-                "@id": "urn:nrel_example/nrel00000228"
+                "@id": "urn:nrel_example/nrel00000570"
             },
             {
-                "@id": "urn:nrel_example/nrel00000329"
+                "@id": "urn:nrel_example/nrel00001013"
             },
             {
-                "@id": "urn:nrel_example/nrel00000884"
+                "@id": "urn:nrel_example/nrel00001323"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000511"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000727"
+            },
             {
-                "@value": "nrel00000038"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000065",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000774"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:nrel_example/nrel00001184"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000948"
+                "@id": "urn:nrel_example/nrel00001287"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000065"
+                "@value": "nrel00000848"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000054",
+        "@id": "urn:nrel_example/nrel00001152",
         "@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/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000054"
+                "@value": "nrel00001152"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000861",
+        "@id": "urn:nrel_example/nrel00001119",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000703"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00001078"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000861"
+                "@id": "urn:nrel_example/nrel00000406"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001077"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001018",
-        "@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/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"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001127"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001018"
+                "@value": "nrel00001119"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000452",
+        "@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-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000452"
+                "@value": "nrel00001107"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000579",
+        "@id": "urn:nrel_example/nrel00001077",
         "@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/nrel00000134"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000579"
+                "@value": "nrel00001077"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000719",
+        "@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": "nrel00000719"
+                "@value": "nrel00000188"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000610",
+        "@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": "nrel00000610"
+                "@value": "nrel00000751"
             }
         ]
     },
     {
-        "@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/nrel00001110",
+        "@id": "urn:nrel_example/nrel00000559",
         "@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/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001110"
+                "@value": "nrel00000559"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000457",
+        "@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": "nrel00000457"
+                "@value": "nrel00001191"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000158",
+        "@id": "urn:nrel_example/nrel00000025",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "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"
@@ -15807,360 +16313,347 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000158"
+                "@value": "nrel00000025"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001119",
+        "@id": "urn:nrel_example/nrel00000812",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000703"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001078"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000406"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001077"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "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://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001127"
+                "@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": "nrel00001119"
+                "@value": "nrel00000812"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000695",
+        "@id": "urn:nrel_example/nrel00000988",
         "@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": "nrel00000695"
+                "@value": "nrel00000988"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000568",
+        "@id": "urn:nrel_example/nrel00000750",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000898"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001051"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "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"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001106"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001201"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000568"
+                "@value": "nrel00000750"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000770",
+        "@id": "urn:nrel_example/nrel00000429",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#Filter"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000882"
+                "@id": "urn:nrel_example/nrel00000158"
             },
             {
-                "@id": "urn:nrel_example/nrel00001192"
+                "@id": "urn:nrel_example/nrel00000940"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000143"
-            },
+                "@id": "urn:nrel_example/nrel00000250"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000244"
-            },
+                "@value": "nrel00000429"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000262",
+        "@type": [
+            "http://data.ashrae.org/standard223#FanCoilUnit"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000276"
+                "@id": "urn:nrel_example/nrel00000035"
             },
             {
-                "@id": "urn:nrel_example/nrel00000311"
+                "@id": "urn:nrel_example/nrel00000505"
             },
             {
-                "@id": "urn:nrel_example/nrel00000624"
+                "@id": "urn:nrel_example/nrel00000729"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000597"
             },
             {
-                "@id": "urn:nrel_example/nrel00000753"
+                "@id": "urn:nrel_example/nrel00000724"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000070"
             },
             {
-                "@id": "urn:nrel_example/nrel00000943"
+                "@id": "urn:nrel_example/nrel00000405"
             },
             {
-                "@id": "urn:nrel_example/nrel00001035"
+                "@id": "urn:nrel_example/nrel00000551"
             },
             {
-                "@id": "urn:nrel_example/nrel00001055"
+                "@id": "urn:nrel_example/nrel00000980"
             },
             {
-                "@id": "urn:nrel_example/nrel00001309"
+                "@id": "urn:nrel_example/nrel00001011"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             },
             {
-                "@id": "urn:nrel_example/nrel00001322"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000770"
+                "@value": "nrel00000262"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000647",
+        "@id": "urn:nrel_example/nrel00000663",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000150"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000836"
+                "@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/nrel00000052"
-            },
+                "@value": "nrel00000663"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000961",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000360"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000647"
+                "@value": "nrel00000961"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000241",
+        "@id": "urn:nrel_example/nrel00000844",
         "@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/nrel00000631"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000274"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001283"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000241"
+                "@value": "nrel00000844"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000448",
+        "@id": "urn:nrel_example/nrel00000506",
         "@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": "nrel00000448"
+                "@value": "nrel00000506"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000596",
+        "@id": "urn:nrel_example/nrel00001150",
         "@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": "nrel00000596"
+                "@value": "nrel00001150"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000680",
+        "@id": "urn:nrel_example/nrel00001045",
         "@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": "nrel00000680"
+                "@value": "nrel00001045"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000064",
+        "@id": "urn:nrel_example/nrel00000172",
         "@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/nrel00000351"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001180"
             }
         ],
-        "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": "nrel00000064"
+                "@value": "nrel00000172"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001213",
+        "@id": "urn:nrel_example/nrel00000499",
         "@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": "nrel00001213"
+                "@value": "nrel00000499"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000153",
+        "@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": "nrel00000153"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001192",
+        "@id": "urn:nrel_example/nrel00000017",
         "@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": "nrel00001192"
+                "@value": "nrel00000017"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000716",
+        "@id": "urn:nrel_example/nrel00000879",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -16171,36 +16664,44 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000716"
+                "@value": "nrel00000879"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000285",
+        "@id": "urn:nrel_example/nrel00000165",
         "@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/nrel00000059"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001161"
+                "@value": "nrel00000165"
             }
+        ]
+    },
+    {
+        "@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-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000285"
+                "@value": "nrel00001091"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000788",
+        "@id": "urn:nrel_example/nrel00000700",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -16211,33 +16712,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000788"
+                "@value": "nrel00000700"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001128",
+        "@id": "urn:nrel_example/nrel00000575",
         "@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": "nrel00001128"
+                "@value": "nrel00000575"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000151",
+        "@id": "urn:nrel_example/nrel00001259",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -16248,138 +16749,120 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000151"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000336",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@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": "nrel00000336"
+                "@value": "nrel00001259"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001308",
+        "@id": "urn:nrel_example/nrel00000361",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000291"
+                "@id": "urn:nrel_example/nrel00000313"
             },
             {
-                "@id": "urn:nrel_example/nrel00000496"
+                "@id": "urn:nrel_example/nrel00000870"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000970"
+                "@id": "urn:nrel_example/nrel00000030"
             },
             {
-                "@id": "urn:nrel_example/nrel00001207"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000283"
+                "@id": "urn:nrel_example/nrel00000704"
             },
             {
-                "@id": "urn:nrel_example/nrel00000651"
+                "@id": "urn:nrel_example/nrel00001034"
             },
             {
-                "@id": "urn:nrel_example/nrel00000661"
-            },
+                "@id": "urn:nrel_example/nrel00001264"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000674"
+                "@id": "urn:nrel_example/nrel00000325"
             },
             {
-                "@id": "urn:nrel_example/nrel00000811"
+                "@id": "urn:nrel_example/nrel00000599"
             },
             {
-                "@id": "urn:nrel_example/nrel00000963"
+                "@id": "urn:nrel_example/nrel00000719"
             },
             {
-                "@id": "urn:nrel_example/nrel00001016"
+                "@id": "urn:nrel_example/nrel00000773"
             },
             {
-                "@id": "urn:nrel_example/nrel00001132"
-            },
+                "@id": "urn:nrel_example/nrel00001313"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001272"
-            },
+                "@value": "nrel00000361"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001181",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001273"
-            },
+                "@id": "urn:nrel_example/nrel00000737"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001331"
+                "@id": "urn:nrel_example/nrel00000915"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001308"
+                "@value": "nrel00001181"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000432",
+        "@id": "urn:nrel_example/nrel00001314",
         "@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-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000432"
+                "@value": "nrel00001314"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000374",
+        "@id": "urn:nrel_example/nrel00000202",
         "@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/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": "nrel00000374"
+                "@value": "nrel00000202"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000623",
+        "@id": "urn:nrel_example/nrel00001167",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -16395,7 +16878,7 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000623"
+                "@value": "nrel00001167"
             }
         ]
     },
@@ -16444,386 +16927,303 @@
         ]
     },
     {
-        "@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": "nrel00001291"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001214",
+        "@id": "urn:nrel_example/nrel00000877",
         "@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": "nrel00001214"
+                "@value": "nrel00000877"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001237",
+        "@id": "urn:nrel_example/nrel00000955",
         "@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": "nrel00001237"
+                "@value": "nrel00000955"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000585",
+        "@id": "urn:nrel_example/nrel00000645",
         "@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": "nrel00000585"
+                "@value": "nrel00000645"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000941",
+        "@id": "urn:nrel_example/nrel00001231",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000251"
+                "@id": "urn:nrel_example/nrel00000366"
             },
             {
-                "@id": "urn:nrel_example/nrel00000846"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000655"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000404"
+                "@id": "urn:nrel_example/nrel00000695"
             },
             {
-                "@id": "urn:nrel_example/nrel00000681"
+                "@id": "urn:nrel_example/nrel00001271"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000941"
+                "@value": "nrel00001231"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001256",
+        "@id": "urn:nrel_example/nrel00000582",
         "@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/nrel00000678"
+                "@id": "urn:nrel_example/nrel00001040"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000571"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001256"
+                "@value": "nrel00000582"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000231",
+        "@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-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000231"
+                "@value": "nrel00000947"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001319",
+        "@id": "urn:nrel_example/nrel00000241",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "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/nrel00000631"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000274"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001283"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001319"
+                "@value": "nrel00000241"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001264",
+        "@id": "urn:nrel_example/nrel00001153",
         "@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-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001264"
+                "@value": "nrel00001153"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000656",
+        "@id": "urn:nrel_example/nrel00000731",
         "@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/nrel00000736"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000640"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000969"
+                "@id": "urn:nrel_example/nrel00001270"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001295"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000656"
+                "@value": "nrel00000731"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001268",
+        "@id": "urn:nrel_example/nrel00000269",
         "@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": "nrel00001268"
+                "@value": "nrel00000269"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000409",
+        "@id": "urn:nrel_example/nrel00000819",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000966"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000409"
+                "@value": "nrel00000819"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000305",
+        "@id": "urn:nrel_example/nrel00000546",
         "@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#Equipment"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000305"
+                "@value": "nrel00000546"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000849",
+        "@id": "urn:nrel_example/nrel00001041",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000948"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000048"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000849"
+                "@value": "nrel00001041"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001089",
+        "@id": "urn:nrel_example/nrel00000998",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000351"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000618"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000821"
+                "@id": "urn:nrel_example/nrel00000465"
             },
             {
-                "@id": "urn:nrel_example/nrel00001304"
+                "@id": "urn:nrel_example/nrel00000786"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000315"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000368"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000431"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000488"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001089"
+                "@value": "nrel00000998"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000544",
+        "@id": "urn:nrel_example/nrel00000428",
         "@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": "nrel00000544"
+                "@value": "nrel00000428"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000124",
+        "@id": "urn:nrel_example/nrel00000388",
         "@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/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000124"
+                "@value": "nrel00000388"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000812",
+        "@id": "urn:nrel_example/nrel00000571",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -16839,67 +17239,46 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000812"
+                "@value": "nrel00000571"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001163",
+        "@id": "urn:nrel_example/nrel00001209",
         "@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/IN_H2O"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@value": "nrel00001163"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000546",
-        "@type": [
-            "http://data.ashrae.org/standard223#Equipment"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000546"
+                "@value": "nrel00001209"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001175",
+        "@id": "urn:nrel_example/nrel00001073",
         "@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-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001175"
+                "@value": "nrel00001073"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000620",
+        "@id": "urn:nrel_example/nrel00000019",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -16908,109 +17287,75 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000620"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000681",
-        "@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": "nrel00000681"
+                "@value": "nrel00000019"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000661",
+        "@id": "urn:nrel_example/nrel00000040",
         "@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": "nrel00000661"
+                "@value": "nrel00000040"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000504",
+        "@id": "urn:nrel_example/nrel00000572",
         "@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": "nrel00000504"
+                "@value": "nrel00000572"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001000",
+        "@id": "urn:nrel_example/nrel00001110",
         "@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": "nrel00001000"
+                "@value": "nrel00001110"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000536",
+        "@id": "urn:nrel_example/nrel00001101",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000806"
+            },
             {
-                "@value": "nrel00000536"
+                "@id": "urn:nrel_example/nrel00000864"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000317",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17019,70 +17364,75 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000317"
+                "@value": "nrel00001101"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000584",
+        "@id": "urn:nrel_example/nrel00000728",
         "@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": "nrel00000584"
+                "@value": "nrel00000728"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000375",
+        "@id": "urn:nrel_example/nrel00000744",
         "@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/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": "nrel00000375"
+                "@value": "nrel00000744"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000020",
+        "@id": "urn:nrel_example/nrel00000946",
         "@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": "nrel00000020"
+                "@value": "nrel00000946"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001130",
+        "@id": "urn:nrel_example/nrel00000809",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17098,39 +17448,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001130"
+                "@value": "nrel00000809"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000613",
+        "@id": "urn:nrel_example/nrel00000784",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000093"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000894"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000952"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001088"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000613"
+                "@value": "nrel00000784"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000776",
+        "@id": "urn:nrel_example/nrel00000508",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -17141,223 +17480,261 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000776"
+                "@value": "nrel00000508"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
+        "@id": "urn:nrel_example/nrel00000023",
         "@type": [
-            "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#EnumeratedObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@value": "EnumerationKind Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
-        "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": "nrel00000023"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000836",
+        "@id": "urn:nrel_example/nrel00000995",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "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": [
             {
-                "@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": "nrel00000836"
+                "@value": "nrel00000995"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000791",
+        "@id": "urn:nrel_example/nrel00000108",
+        "@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": "nrel00000108"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001140",
         "@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": "nrel00000791"
+                "@value": "nrel00001140"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000329",
+        "@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-Override"
+                "@id": "urn:nrel_example/nrel00000045"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000162"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "nrel00000329"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001251",
-        "@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/nrel00001014"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001295"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001251"
+                "@value": "nrel00000736"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001273",
+        "@id": "urn:nrel_example/nrel00001036",
         "@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/ElectricPower"
+                "@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/KiloW"
+                "@id": "urn:nrel_example/nrel00000462"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001273"
+                "@value": "nrel00001036"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001310",
+        "@id": "urn:nrel_example/nrel00000777",
         "@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/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000776"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001164"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "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": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000889"
+            },
             {
-                "@value": "nrel00001310"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000696",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000974"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001290"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000696"
+                "@value": "nrel00000777"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000795",
+        "@id": "urn:nrel_example/nrel00000709",
         "@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": "nrel00000795"
+                "@value": "nrel00000709"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000251",
+        "@id": "urn:nrel_example/nrel00000787",
         "@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/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": "nrel00000251"
+                "@value": "nrel00000787"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000413",
+        "@id": "urn:nrel_example/nrel00000860",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000927"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000950"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000013"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000103"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000413"
+                "@value": "nrel00000860"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001234",
+        "@id": "urn:nrel_example/nrel00000912",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17366,102 +17743,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001234"
+                "@value": "nrel00000912"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001217",
+        "@id": "urn:nrel_example/nrel00000444",
         "@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": "nrel00001217"
+                "@value": "nrel00000444"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000035",
+        "@id": "urn:nrel_example/nrel00001120",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000522"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000824"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000317"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000685"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000808"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000976"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "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"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000994"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000035"
+                "@value": "nrel00001120"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000615",
+        "@id": "urn:nrel_example/nrel00000805",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000281"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@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": "nrel00000615"
+                "@value": "nrel00000805"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000319",
+        "@id": "urn:nrel_example/nrel00000315",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17477,7 +17822,7 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000319"
+                "@value": "nrel00000315"
             }
         ]
     },
@@ -17521,7 +17866,39 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000740",
+        "@id": "urn:nrel_example/nrel00000570",
+        "@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": "nrel00000570"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001328",
+        "@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": "nrel00001328"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000752",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17537,240 +17914,242 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000740"
+                "@value": "nrel00000752"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000495",
+        "@id": "urn:nrel_example/nrel00000277",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000331"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001111"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
-        "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"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000713"
-            },
+                "@value": "nrel00000277"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000090",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000730"
-            },
+                "@id": "urn:nrel_example/nrel00000466"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000819"
-            },
+                "@id": "urn:nrel_example/nrel00001121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000831"
-            },
+                "@id": "urn:nrel_example/nrel00000068"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001000"
-            },
+                "@value": "nrel00000090"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000579",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001039"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000495"
+                "@value": "nrel00000579"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000963",
+        "@id": "urn:nrel_example/nrel00000549",
         "@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/ElectricCurrent"
+                "@id": "urn:nrel_example/nrel00000050"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000760"
             }
         ],
-        "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": "nrel00000549"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000834",
+        "@id": "urn:nrel_example/nrel00000481",
         "@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-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000834"
+                "@value": "nrel00000481"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001212",
+        "@id": "urn:nrel_example/nrel00000116",
         "@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": "nrel00001212"
+                "@value": "nrel00000116"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000132",
+        "@id": "urn:nrel_example/nrel00000856",
         "@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/nrel00000045"
             }
         ],
-        "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/nrel00000969"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000610"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000132"
+                "@value": "nrel00000856"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000677",
+        "@id": "urn:nrel_example/nrel00000092",
         "@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/nrel00000017"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000208"
+                "@id": "urn:nrel_example/nrel00000275"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000677"
+                "@value": "nrel00000092"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000339",
+        "@id": "urn:nrel_example/nrel00001215",
         "@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": "nrel00000339"
+                "@value": "nrel00001215"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000912",
+        "@id": "urn:nrel_example/nrel00000257",
         "@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": "nrel00000912"
+                "@value": "nrel00000257"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000732",
+        "@id": "urn:nrel_example/nrel00001194",
         "@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#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": "nrel00000732"
+                "@value": "nrel00001194"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000868",
+        "@id": "urn:nrel_example/nrel00000100",
         "@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-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000868"
+                "@value": "nrel00000100"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000609",
+        "@id": "urn:nrel_example/nrel00000520",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17786,168 +18165,120 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000609"
+                "@value": "nrel00000520"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000587",
+        "@id": "urn:nrel_example/nrel00000803",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000745"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000986"
+                "@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"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000433"
-            },
+                "@value": "nrel00000803"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000952",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000844"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000587"
+                "@value": "nrel00000952"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000355",
+        "@id": "urn:nrel_example/nrel00000518",
         "@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": "nrel00000355"
+                "@value": "nrel00000518"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000904",
+        "@id": "urn:nrel_example/nrel00000839",
         "@type": [
             "http://data.ashrae.org/standard223#CoolingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000112"
+                "@id": "urn:nrel_example/nrel00001092"
             },
             {
-                "@id": "urn:nrel_example/nrel00000123"
+                "@id": "urn:nrel_example/nrel00001115"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000248"
+                "@id": "urn:nrel_example/nrel00000356"
             },
             {
-                "@id": "urn:nrel_example/nrel00000874"
+                "@id": "urn:nrel_example/nrel00000508"
             },
             {
-                "@id": "urn:nrel_example/nrel00000973"
+                "@id": "urn:nrel_example/nrel00001062"
             },
             {
-                "@id": "urn:nrel_example/nrel00000996"
+                "@id": "urn:nrel_example/nrel00001189"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000140"
+                "@id": "urn:nrel_example/nrel00000125"
             },
             {
-                "@id": "urn:nrel_example/nrel00000298"
+                "@id": "urn:nrel_example/nrel00000552"
             },
             {
-                "@id": "urn:nrel_example/nrel00000330"
+                "@id": "urn:nrel_example/nrel00000654"
             },
             {
-                "@id": "urn:nrel_example/nrel00001239"
+                "@id": "urn:nrel_example/nrel00001126"
             },
             {
-                "@id": "urn:nrel_example/nrel00001317"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000904"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000369",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000441"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000758"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000369"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001093",
-        "@type": [
-            "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": "nrel00001093"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000876",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001247"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000876"
+                "@value": "nrel00000839"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000858",
+        "@id": "urn:nrel_example/nrel00000801",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -17958,44 +18289,83 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000858"
+                "@value": "nrel00000801"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000715",
+        "@id": "urn:nrel_example/nrel00000209",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@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": "urn:nrel_example/nrel00001233"
+            }
+        ],
+        "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": "nrel00000715"
+                "@value": "nrel00000209"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000950",
+        "@id": "urn:nrel_example/nrel00000391",
         "@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": "nrel00000950"
+                "@value": "nrel00000391"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000555",
+        "@id": "urn:nrel_example/nrel00000225",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -18011,329 +18381,292 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000555"
+                "@value": "nrel00000225"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001131",
+        "@id": "urn:nrel_example/nrel00000340",
         "@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"
+                "@id": "urn:nrel_example/nrel00000051"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000681"
+                "@id": "urn:nrel_example/nrel00000202"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001131"
+                "@value": "nrel00000340"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001332",
+        "@id": "urn:nrel_example/nrel00001320",
         "@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#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000792"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00001332"
+                "@id": "urn:nrel_example/nrel00000464"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000326",
-        "@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/nrel00000825"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000326"
+                "@value": "nrel00001320"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000821",
+        "@id": "urn:nrel_example/nrel00000334",
         "@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/nrel00000587"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000821"
+                "@id": "urn:nrel_example/nrel00000160"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000190",
-        "@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/nrel00000433"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000190"
+                "@value": "nrel00000334"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000999",
+        "@id": "urn:nrel_example/nrel00000226",
         "@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"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000031"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000371"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000999"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000058",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000063"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000760"
+                "@id": "urn:nrel_example/nrel00000269"
             },
             {
-                "@id": "urn:nrel_example/nrel00000984"
+                "@id": "urn:nrel_example/nrel00000663"
             },
             {
-                "@id": "urn:nrel_example/nrel00001260"
+                "@id": "urn:nrel_example/nrel00001316"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000204"
+            },
             {
-                "@value": "nrel00000058"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000700",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000213"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000557"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000803"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001293"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000700"
+                "@value": "nrel00000226"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001107",
+        "@id": "urn:nrel_example/nrel00000901",
         "@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": "nrel00001107"
+                "@value": "nrel00000901"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000910",
+        "@id": "urn:nrel_example/nrel00000754",
         "@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/nrel00000376"
+            },
             {
-                "@value": "nrel00000910"
+                "@id": "urn:nrel_example/nrel00000712"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000491",
-        "@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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:nrel_example/nrel00000044"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000180"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000310"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000370"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000377"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000639"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000868"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000997"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000864"
+                "@id": "urn:nrel_example/nrel00001010"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001257"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000491"
+                "@value": "nrel00000754"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000751",
+        "@id": "urn:nrel_example/nrel00000037",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000138"
-            }
-        ],
-        "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/nrel00001283"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000751"
+                "@value": "nrel00000037"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001094",
+        "@id": "urn:nrel_example/nrel00000033",
         "@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": "nrel00001094"
+                "@value": "nrel00000033"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001247",
+        "@id": "urn:nrel_example/nrel00001007",
         "@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": "nrel00001247"
+                "@value": "nrel00001007"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000034",
+        "@id": "urn:nrel_example/nrel00000527",
         "@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": "nrel00000034"
+                "@value": "nrel00000527"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000030",
+        "@id": "urn:nrel_example/nrel00001225",
         "@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": "nrel00000030"
+                "@value": "nrel00001225"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000752",
+        "@id": "urn:nrel_example/nrel00000557",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -18349,449 +18682,416 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000752"
+                "@value": "nrel00000557"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000530",
+        "@id": "urn:nrel_example/nrel00001000",
         "@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#QuantifiableActuatableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000530"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000415",
-        "@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/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000415"
+                "@value": "nrel00001000"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001143",
+        "@id": "urn:nrel_example/nrel00000483",
         "@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/nrel00000512"
-            },
+                "@id": "urn:nrel_example/nrel00000862"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001193"
+                "@id": "urn:nrel_example/nrel00000464"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001134"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001143"
+                "@value": "nrel00000483"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000133",
+        "@id": "urn:nrel_example/nrel00001255",
         "@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/nrel00000432"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001235"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000133"
+                "@value": "nrel00001255"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001249",
+        "@id": "urn:nrel_example/nrel00001277",
         "@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"
+                "@id": "urn:nrel_example/nrel00001080"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001123"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001249"
+                "@value": "nrel00001277"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000826",
+        "@id": "urn:nrel_example/nrel00001242",
         "@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": "nrel00000826"
+                "@value": "nrel00001242"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000449",
+        "@id": "urn:nrel_example/nrel00000593",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000784"
+                "@id": "urn:nrel_example/nrel00000087"
             },
             {
-                "@id": "urn:nrel_example/nrel00001129"
+                "@id": "urn:nrel_example/nrel00000434"
             }
         ],
         "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"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001222"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001289"
+                "@id": "urn:nrel_example/nrel00000301"
             },
             {
-                "@id": "urn:nrel_example/nrel00001326"
+                "@id": "urn:nrel_example/nrel00001215"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000449"
+                "@value": "nrel00000593"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000648",
+        "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000648"
-            }
-        ]
-    },
-    {
-        "@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-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000970"
+                "@value": "nrel00000594"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000130",
+        "@id": "urn:nrel_example/nrel00000369",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000380"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000579"
+                "@id": "urn:nrel_example/nrel00000441"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000758"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000130"
+                "@value": "nrel00000369"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000187",
+        "@id": "urn:nrel_example/nrel00000887",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000205"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000273"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000369"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000925"
-            },
+                "@id": "urn:nrel_example/nrel00001311"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001315"
+                "@id": "urn:nrel_example/nrel00000575"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000441"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001047"
+                "@value": "nrel00000887"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000534",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000118"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000132"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000758"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000187"
+                "@value": "nrel00000534"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000221",
+        "@id": "urn:nrel_example/nrel00000734",
         "@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/nrel00000075"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000740"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000221"
+                "@value": "nrel00000734"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000376",
+        "@id": "urn:nrel_example/nrel00000211",
         "@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": "nrel00000376"
+                "@value": "nrel00000211"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000085",
+        "@id": "urn:nrel_example/nrel00000168",
         "@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/nrel00001265"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000042"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000085"
+                "@value": "nrel00000168"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000475",
+        "@id": "urn:nrel_example/nrel00000268",
         "@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/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": "nrel00000268"
+            }
+        ]
+    },
+    {
+        "@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": "nrel00000475"
+                "@value": "nrel00001097"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000215",
+        "@id": "urn:nrel_example/nrel00000389",
         "@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": "nrel00000215"
+                "@value": "nrel00000389"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000863",
+        "@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": "nrel00000863"
+                "@value": "nrel00000893"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000121",
+        "@id": "urn:nrel_example/nrel00000908",
         "@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:nrel_example/nrel00000941"
+                "@id": "urn:nrel_example/nrel00000397"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000071"
-            },
+        "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": "nrel00000121"
+                "@value": "nrel00000908"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000400",
+        "@id": "urn:nrel_example/nrel00001106",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000305"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000738"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000400"
+                "@value": "nrel00001106"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000357",
+        "@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"
+                "@id": "urn:nrel_example/nrel00000278"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000603"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000357"
+                "@value": "nrel00000396"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001117",
+        "@id": "urn:nrel_example/nrel00000745",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -18800,91 +19100,107 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001117"
+                "@value": "nrel00000745"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000643",
+        "@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-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000643"
+                "@value": "nrel00000660"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000943",
+        "@id": "urn:nrel_example/nrel00001332",
         "@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": "nrel00000943"
+                "@value": "nrel00001332"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000394",
+        "@id": "urn:nrel_example/nrel00001310",
         "@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": "nrel00000394"
+                "@value": "nrel00001310"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000092",
+        "@id": "urn:nrel_example/nrel00001017",
         "@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/nrel00000017"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000275"
+                "@value": "nrel00001017"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001033",
+        "@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/nrel00001123"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000092"
+                "@value": "nrel00001033"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000468",
+        "@id": "urn:nrel_example/nrel00001290",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -18895,14 +19211,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000468"
+                "@value": "nrel00001290"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001049",
+        "@id": "urn:nrel_example/nrel00000355",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -18911,703 +19227,695 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001049"
+                "@value": "nrel00000355"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000762",
+        "@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-RunStatus"
+                "@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": "nrel00000762"
+                "@value": "nrel00000686"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000052",
+        "@id": "urn:nrel_example/nrel00000125",
         "@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": "nrel00000052"
+                "@value": "nrel00000125"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000522",
+        "@id": "urn:nrel_example/nrel00001143",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000801"
+                "@id": "urn:nrel_example/nrel00000512"
             },
             {
-                "@id": "urn:nrel_example/nrel00000957"
+                "@id": "urn:nrel_example/nrel00001193"
             }
         ],
-        "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"
-            },
-            {
-                "@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"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001245"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000522"
+                "@value": "nrel00001143"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000877",
+        "@id": "urn:nrel_example/nrel00001070",
         "@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/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": "nrel00000877"
+                "@value": "nrel00001070"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000499",
+        "@id": "urn:nrel_example/nrel00001206",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000499"
+                "@value": "nrel00001206"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000789",
+        "@id": "urn:nrel_example/nrel00001160",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000361"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000381"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000770"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001025"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001301"
+                "@value": "nrel00001160"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001315",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000442"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000481"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000918"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001238"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001324"
+                "@id": "urn:nrel_example/nrel00000441"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00000132"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000789"
+                "@value": "nrel00001315"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000031",
+        "@id": "urn:nrel_example/nrel00000152",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000840"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000858"
+                "@id": "urn:nrel_example/nrel00000354"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000268"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000598"
+                "@id": "urn:nrel_example/nrel00000823"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000031"
+                "@value": "nrel00000152"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001240",
+        "@id": "urn:nrel_example/nrel00000281",
         "@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": "nrel00001240"
+                "@value": "nrel00000281"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000454",
+        "@id": "urn:nrel_example/nrel00000818",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000019"
+                "@id": "urn:nrel_example/nrel00000221"
             },
             {
-                "@id": "urn:nrel_example/nrel00001018"
+                "@id": "urn:nrel_example/nrel00001086"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000411"
+                "@id": "urn:nrel_example/nrel00000739"
             },
             {
-                "@id": "urn:nrel_example/nrel00000962"
+                "@id": "urn:nrel_example/nrel00001130"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000454"
+                "@value": "nrel00000818"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000741",
+        "@id": "urn:nrel_example/nrel00001022",
         "@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/nrel00000463"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001307"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000741"
+                "@value": "nrel00001022"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001277",
+        "@id": "urn:nrel_example/nrel00001281",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001080"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001123"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00001277"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000353",
-        "@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-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000353"
+                "@value": "nrel00001281"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000010",
+        "@id": "urn:nrel_example/nrel00000916",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000818"
+                "@id": "urn:nrel_example/nrel00000600"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000336"
+                "@id": "urn:nrel_example/nrel00000114"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000739"
+                "@id": "urn:nrel_example/nrel00001059"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000010"
+                "@value": "nrel00000916"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000261",
+        "@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": "nrel00000261"
+                "@value": "nrel00001102"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001177",
+        "@id": "urn:nrel_example/nrel00000600",
         "@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/ElectricCurrent"
+                "@id": "urn:nrel_example/nrel00000439"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001049"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@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": "nrel00001177"
+                "@value": "nrel00000600"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000349",
+        "@id": "urn:nrel_example/nrel00000051",
         "@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": "nrel00000349"
+                "@value": "nrel00000051"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000975",
+        "@id": "urn:nrel_example/nrel00001186",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000074"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001208"
+            }
         ],
         "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": "nrel00000975"
+                "@value": "nrel00001186"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000865",
+        "@id": "urn:nrel_example/nrel00000157",
         "@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": "nrel00000157"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001070",
+        "@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": "nrel00001070"
+                "@value": "nrel00000919"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000921",
+        "@id": "urn:nrel_example/nrel00001042",
         "@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-Water"
+                "@id": "urn:nrel_example/nrel00000530"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000834"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000606"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001124"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000921"
+                "@value": "nrel00001042"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001103",
+        "@id": "urn:nrel_example/nrel00000880",
         "@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": "nrel00001103"
+                "@value": "nrel00000880"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000338",
+        "@id": "urn:nrel_example/nrel00000994",
         "@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": "nrel00000338"
+                "@value": "nrel00000994"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000073",
+        "@id": "urn:nrel_example/nrel00000945",
         "@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/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000332"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000073"
+                "@value": "nrel00000945"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000873",
+        "@id": "urn:nrel_example/nrel00000430",
         "@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": "nrel00000873"
+                "@value": "nrel00000430"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000114",
+        "@id": "urn:nrel_example/nrel00000892",
         "@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:nrel_example/nrel00000600"
+                "@id": "urn:nrel_example/nrel00000077"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000477"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000594"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000114"
+                "@value": "nrel00000892"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001017",
+        "@id": "urn:nrel_example/nrel00001004",
         "@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/nrel00000221"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@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": "nrel00001017"
+                "@value": "nrel00001004"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000015",
+        "@id": "urn:nrel_example/nrel00000713",
         "@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": "nrel00000015"
+                "@value": "nrel00000713"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001235",
+        "@id": "urn:nrel_example/nrel00000528",
         "@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": "nrel00001235"
+                "@value": "nrel00000528"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000426",
+        "@id": "urn:nrel_example/nrel00000217",
         "@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/nrel00000161"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000565"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000426"
+                "@value": "nrel00000217"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000431",
+        "@id": "urn:nrel_example/nrel00000648",
         "@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": "nrel00000431"
+                "@value": "nrel00000648"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000642",
+        "@id": "urn:nrel_example/nrel00000206",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000586"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000923"
+                "@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": "nrel00000642"
+                "@value": "nrel00000206"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000461",
+        "@id": "urn:nrel_example/nrel00000104",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001198"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000104"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000380",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -19616,190 +19924,208 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000461"
+                "@value": "nrel00000380"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000188",
+        "@id": "urn:nrel_example/nrel00001212",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000249"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000596"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000694"
-            },
+        "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": "nrel00001212"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001019",
+        "@id": "urn:nrel_example/nrel00001149",
         "@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/nrel00000742"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001019"
+                "@value": "nrel00001149"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000291",
+        "@id": "urn:nrel_example/nrel00001057",
         "@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#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000027"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000837"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000291"
+                "@value": "nrel00001057"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000566",
+        "@id": "urn:nrel_example/nrel00000693",
         "@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/nrel00001194"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00000373"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000566"
+                "@value": "nrel00000693"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000731",
+        "@id": "urn:nrel_example/nrel00000729",
         "@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/nrel00000640"
+                "@id": "urn:nrel_example/nrel00000018"
             },
             {
-                "@id": "urn:nrel_example/nrel00001270"
+                "@id": "urn:nrel_example/nrel00000619"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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": "nrel00000731"
+                "@value": "nrel00000729"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000722",
+        "@id": "urn:nrel_example/nrel00000632",
         "@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": "nrel00000722"
+                "@value": "nrel00000632"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000575",
+        "@id": "urn:nrel_example/nrel00000367",
         "@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/nrel00000219"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000464"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000956"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000575"
+                "@value": "nrel00000367"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001083",
+        "@id": "urn:nrel_example/nrel00000012",
         "@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/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001083"
+                "@value": "nrel00000012"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001145",
+        "@id": "urn:nrel_example/nrel00000684",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -19815,24 +20141,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001145"
+                "@value": "nrel00000684"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000966",
+        "@id": "urn:nrel_example/nrel00001267",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000059"
+                "@id": "urn:nrel_example/nrel00000186"
             },
             {
-                "@id": "urn:nrel_example/nrel00000098"
+                "@id": "urn:nrel_example/nrel00000236"
             },
             {
-                "@id": "urn:nrel_example/nrel00000658"
+                "@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#hasDomain": [
@@ -19842,111 +20177,143 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000109"
+                "@id": "urn:nrel_example/nrel00000184"
             },
             {
-                "@id": "urn:nrel_example/nrel00000845"
+                "@id": "urn:nrel_example/nrel00000743"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000966"
+                "@value": "nrel00001267"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000554",
+        "@id": "urn:nrel_example/nrel00000207",
         "@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": "nrel00000554"
+                "@value": "nrel00000207"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001034",
+        "@id": "urn:nrel_example/nrel00001280",
         "@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": "nrel00001034"
+                "@value": "nrel00001280"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000989",
+        "@id": "urn:nrel_example/nrel00000915",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000818"
-            },
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000939"
-            },
+                "@value": "nrel00000915"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000577",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000941"
+                "@id": "urn:nrel_example/nrel00000891"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@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": "nrel00000989"
+                "@value": "nrel00000577"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000872",
+        "@id": "urn:nrel_example/nrel00001132",
         "@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/nrel00001234"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001298"
+                "@value": "nrel00001132"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000710",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001209"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001251"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000872"
+                "@value": "nrel00000710"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000903",
+        "@id": "urn:nrel_example/nrel00001270",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000589"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -19955,188 +20322,220 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000903"
+                "@value": "nrel00001270"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000407",
+        "@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/nrel00001025"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001203"
+            }
         ],
         "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": "nrel00000701"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000506",
+        "@id": "urn:nrel_example/nrel00000445",
         "@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": "nrel00000506"
+                "@value": "nrel00000445"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000637",
+        "@id": "urn:nrel_example/nrel00001131",
         "@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/nrel00000941"
             }
         ],
-        "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/nrel00000121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000681"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000637"
+                "@value": "nrel00001131"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000334",
+        "@id": "urn:nrel_example/nrel00000944",
         "@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/nrel00000587"
+                "@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/nrel00000160"
+                "@value": "nrel00000944"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001241",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000433"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000334"
+                "@value": "nrel00001241"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000685",
+        "@id": "urn:nrel_example/nrel00001109",
         "@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": "nrel00000685"
+                "@value": "nrel00001109"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000026",
+        "@id": "urn:nrel_example/nrel00000088",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000986"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001194"
+            }
         ],
         "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": "nrel00000088"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000273",
+        "@id": "urn:nrel_example/nrel00000460",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000214"
+                "@id": "urn:nrel_example/nrel00000300"
             },
             {
-                "@id": "urn:nrel_example/nrel00000293"
+                "@id": "urn:nrel_example/nrel00000817"
             },
             {
-                "@id": "urn:nrel_example/nrel00000920"
+                "@id": "urn:nrel_example/nrel00001162"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000040"
+                "@id": "urn:nrel_example/nrel00000065"
             },
             {
-                "@id": "urn:nrel_example/nrel00000638"
+                "@id": "urn:nrel_example/nrel00001050"
             },
             {
-                "@id": "urn:nrel_example/nrel00000720"
+                "@id": "urn:nrel_example/nrel00001072"
             },
             {
-                "@id": "urn:nrel_example/nrel00001069"
+                "@id": "urn:nrel_example/nrel00001107"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000412"
+                "@id": "urn:nrel_example/nrel00000518"
             },
             {
-                "@id": "urn:nrel_example/nrel00000419"
+                "@id": "urn:nrel_example/nrel00000684"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000273"
+                "@value": "nrel00000460"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001013",
+        "@id": "urn:nrel_example/nrel00000463",
         "@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": "nrel00001013"
+                "@value": "nrel00000463"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000281",
+        "@id": "urn:nrel_example/nrel00000635",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -20147,144 +20546,176 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000281"
+                "@value": "nrel00000635"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001170",
+        "@id": "urn:nrel_example/nrel00000171",
         "@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"
+                "@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": "nrel00001170"
+                "@value": "nrel00000171"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000435",
+        "@id": "urn:nrel_example/nrel00000640",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "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": "nrel00000640"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000904",
+        "@type": [
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000110"
+                "@id": "urn:nrel_example/nrel00000112"
             },
             {
-                "@id": "urn:nrel_example/nrel00000142"
+                "@id": "urn:nrel_example/nrel00000123"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000248"
             },
             {
-                "@id": "urn:nrel_example/nrel00000460"
+                "@id": "urn:nrel_example/nrel00000874"
             },
             {
-                "@id": "urn:nrel_example/nrel00000849"
+                "@id": "urn:nrel_example/nrel00000973"
             },
             {
-                "@id": "urn:nrel_example/nrel00000917"
+                "@id": "urn:nrel_example/nrel00000996"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000462"
+                "@id": "urn:nrel_example/nrel00000140"
             },
             {
-                "@id": "urn:nrel_example/nrel00000948"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000298"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000048"
+                "@id": "urn:nrel_example/nrel00000330"
             },
             {
-                "@id": "urn:nrel_example/nrel00000124"
+                "@id": "urn:nrel_example/nrel00001239"
             },
             {
-                "@id": "urn:nrel_example/nrel00000641"
+                "@id": "urn:nrel_example/nrel00001317"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000435"
+                "@value": "nrel00000904"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000146",
+        "@id": "urn:nrel_example/nrel00000265",
         "@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": "nrel00000146"
+                "@value": "nrel00000265"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000714",
+        "@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": "nrel00000714"
+                "@value": "nrel00001085"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000398",
+        "@id": "urn:nrel_example/nrel00000078",
         "@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-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000398"
+                "@value": "nrel00000078"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001210",
+        "@id": "urn:nrel_example/nrel00000974",
         "@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/Frequency"
+            }
         ],
-        "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/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001210"
+                "@value": "nrel00000974"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000166",
+        "@id": "urn:nrel_example/nrel00001002",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -20300,100 +20731,75 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000166"
+                "@value": "nrel00001002"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001218",
+        "@id": "urn:nrel_example/nrel00000993",
         "@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": "nrel00001218"
+                "@value": "nrel00000993"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001115",
+        "@id": "urn:nrel_example/nrel00000351",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000014"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000237"
+                "@id": "urn:nrel_example/nrel00000172"
             }
         ],
-        "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#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": "nrel00000351"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000453",
+        "@id": "urn:nrel_example/nrel00000303",
         "@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": "nrel00000453"
+                "@value": "nrel00000303"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000134",
+        "@id": "urn:nrel_example/nrel00000897",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -20404,105 +20810,51 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000134"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000360",
-        "@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": "nrel00000360"
+                "@value": "nrel00000897"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000870",
+        "@id": "urn:nrel_example/nrel00000673",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000901"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000975"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "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"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001253"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001310"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000870"
+                "@value": "nrel00000673"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000244",
+        "@id": "urn:nrel_example/nrel00000814",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000244"
+                "@value": "nrel00000814"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000813",
+        "@id": "urn:nrel_example/nrel00001302",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001107"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001302"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20511,30 +20863,38 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000813"
+                "@value": "nrel00001302"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000186",
+        "@id": "urn:nrel_example/nrel00000910",
         "@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": "nrel00000186"
+                "@value": "nrel00000910"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001063",
+        "@id": "urn:nrel_example/nrel00000891",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000158"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000577"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20543,408 +20903,336 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001063"
+                "@value": "nrel00000891"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000886",
+        "@id": "urn:nrel_example/nrel00001324",
         "@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": "nrel00001324"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000280",
+        "@id": "urn:nrel_example/nrel00000313",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000003"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000055"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000848"
-            }
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000278"
+                "@id": "urn:nrel_example/nrel00000296"
             },
             {
-                "@id": "urn:nrel_example/nrel00001157"
+                "@id": "urn:nrel_example/nrel00000428"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000988"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001152"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001204"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001244"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001282"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000066"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00001269"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000280"
+                "@value": "nrel00000313"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000209",
+        "@id": "urn:nrel_example/nrel00000683",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#HeatExchanger"
         ],
         "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/nrel00000083"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000131"
+                "@id": "urn:nrel_example/nrel00000344"
             },
             {
-                "@id": "urn:nrel_example/nrel00000355"
+                "@id": "urn:nrel_example/nrel00000546"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000392"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000752"
+                "@id": "urn:nrel_example/nrel00000183"
             },
             {
-                "@id": "urn:nrel_example/nrel00000805"
+                "@id": "urn:nrel_example/nrel00000189"
             },
             {
-                "@id": "urn:nrel_example/nrel00001160"
+                "@id": "urn:nrel_example/nrel00000271"
             },
             {
-                "@id": "urn:nrel_example/nrel00001233"
+                "@id": "urn:nrel_example/nrel00000923"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000067"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000209"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001281",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:nrel_example/nrel00000163"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00001094"
             }
         ],
-        "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-Evaporator"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001281"
+                "@value": "nrel00000683"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000727",
+        "@id": "urn:nrel_example/nrel00000743",
         "@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": "nrel00000727"
+                "@value": "nrel00000743"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000408",
+        "@id": "urn:nrel_example/nrel00000953",
         "@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": "nrel00000408"
+                "@value": "nrel00000953"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001204",
+        "@id": "urn:nrel_example/nrel00000491",
         "@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://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000864"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001204"
+                "@value": "nrel00000491"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000816",
+        "@id": "urn:nrel_example/nrel00000903",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001125"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "urn:nrel_example/nrel00000589"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000002"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000816"
+                "@value": "nrel00000903"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000871",
+        "@id": "urn:nrel_example/nrel00000074",
         "@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": "nrel00000871"
+                "@value": "nrel00000074"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000854",
+        "@id": "urn:nrel_example/nrel00000425",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000781"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001027"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000537"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000854"
+                "@value": "nrel00000425"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000922",
+        "@id": "urn:nrel_example/nrel00000471",
         "@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/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": "nrel00000922"
+                "@value": "nrel00000471"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000800",
+        "@id": "urn:nrel_example/nrel00000048",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001064"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000216"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000800"
+                "@value": "nrel00000048"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001329",
+        "@id": "urn:nrel_example/nrel00001269",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000207"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "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": "nrel00001269"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000790",
+        "@id": "urn:nrel_example/nrel00000622",
         "@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": "nrel00000622"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000358",
+        "@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": "nrel00000358"
+                "@value": "nrel00000697"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000108",
+        "@id": "urn:nrel_example/nrel00000138",
         "@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": "nrel00000108"
+                "@value": "nrel00000138"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001129",
+        "@id": "urn:nrel_example/nrel00001050",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20953,12 +21241,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001129"
+                "@value": "nrel00001050"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000198",
+        "@id": "urn:nrel_example/nrel00000723",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -20969,42 +21257,58 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000198"
+                "@value": "nrel00000723"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000206",
+        "@id": "urn:nrel_example/nrel00001093",
         "@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": "nrel00000206"
+                "@value": "nrel00001093"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000490",
+        "@id": "urn:nrel_example/nrel00000353",
+        "@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": "nrel00000353"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001278",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001020"
+                "@id": "urn:nrel_example/nrel00001260"
             },
             {
-                "@id": "urn:nrel_example/nrel00001200"
+                "@id": "urn:nrel_example/nrel00001311"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21014,12 +21318,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000490"
+                "@value": "nrel00001278"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000393",
+        "@id": "urn:nrel_example/nrel00000271",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -21030,39 +21334,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000393"
+                "@value": "nrel00000271"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000657",
+        "@id": "urn:nrel_example/nrel00001177",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000779"
-            },
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000912"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000767"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001133"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000657"
+                "@value": "nrel00001177"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000529",
+        "@id": "urn:nrel_example/nrel00000094",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -21078,187 +21376,146 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000529"
+                "@value": "nrel00000094"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000466",
+        "@id": "urn:nrel_example/nrel00000147",
         "@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": "nrel00000466"
+                "@value": "nrel00000147"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000053",
+        "@id": "urn:nrel_example/nrel00000128",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000461"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000931"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "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://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001093"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000053"
+                "@value": "nrel00000128"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001043",
+        "@id": "urn:nrel_example/nrel00001329",
         "@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/nrel00000207"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000709"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001043"
+                "@value": "nrel00001329"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001284",
+        "@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"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000961"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001284"
+                "@value": "nrel00000530"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001021",
+        "@id": "urn:nrel_example/nrel00000161",
         "@type": [
-            "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#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": "nrel00001021"
+                "@value": "nrel00000161"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000844",
+        "@id": "urn:nrel_example/nrel00000766",
         "@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": "nrel00000844"
+                "@value": "nrel00000766"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000402",
+        "@id": "urn:nrel_example/nrel00001043",
         "@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#OutletConnectionPoint"
         ],
-        "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": "nrel00000402"
+                "@value": "nrel00001043"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001262",
+        "@id": "urn:nrel_example/nrel00000627",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -21267,242 +21524,235 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001262"
+                "@value": "nrel00000627"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000129",
+        "@id": "urn:nrel_example/nrel00000847",
         "@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": "nrel00000129"
+                "@value": "nrel00000847"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000787",
+        "@id": "urn:nrel_example/nrel00000541",
         "@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/nrel00000080"
+                "@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/nrel00000859"
+                "@value": "nrel00000541"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000869",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000319"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000787"
+                "@value": "nrel00000869"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000819",
+        "@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": "nrel00000819"
+                "@value": "nrel00000959"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000361",
+        "@id": "urn:nrel_example/nrel00000651",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000313"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000870"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000030"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000704"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001034"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001264"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000325"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000599"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000719"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000773"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001313"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000361"
+                "@value": "nrel00000651"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001184",
+        "@id": "urn:nrel_example/nrel00000452",
         "@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": "nrel00001184"
+                "@value": "nrel00000452"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000006",
+        "@id": "urn:nrel_example/nrel00000057",
         "@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": "nrel00000006"
+                "@value": "nrel00000057"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000048",
+        "@id": "urn:nrel_example/nrel00000457",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000048"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000850",
-        "@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/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000850"
+                "@value": "nrel00000457"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000675",
+        "@id": "urn:nrel_example/nrel00000770",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000574"
+                "@id": "urn:nrel_example/nrel00000882"
             },
             {
-                "@id": "urn:nrel_example/nrel00000691"
+                "@id": "urn:nrel_example/nrel00001192"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000347"
+                "@id": "urn:nrel_example/nrel00000143"
             },
             {
-                "@id": "urn:nrel_example/nrel00001153"
+                "@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": "nrel00000675"
+                "@value": "nrel00000770"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000913",
+        "@id": "urn:nrel_example/nrel00000010",
         "@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/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": "nrel00000913"
+                "@value": "nrel00000010"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001306",
+        "@id": "urn:nrel_example/nrel00000213",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -21518,165 +21768,149 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001306"
+                "@value": "nrel00000213"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000445",
+        "@id": "urn:nrel_example/nrel00000024",
         "@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#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": "nrel00000445"
+                "@value": "nrel00000024"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000526",
+        "@id": "urn:nrel_example/nrel00000390",
         "@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": "nrel00000526"
+                "@value": "nrel00000390"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000736",
+        "@id": "urn:nrel_example/nrel00000109",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000045"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000162"
-            }
+            "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/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00001014"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001295"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000736"
+                "@value": "nrel00000109"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000744",
+        "@id": "urn:nrel_example/nrel00000574",
         "@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/Energy"
+                "@id": "urn:nrel_example/nrel00001211"
             }
         ],
-        "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": "nrel00000744"
+                "@value": "nrel00000574"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000866",
+        "@id": "urn:nrel_example/nrel00000093",
         "@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#InletConnectionPoint"
         ],
-        "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": "nrel00000866"
+                "@value": "nrel00000093"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000501",
+        "@id": "urn:nrel_example/nrel00001079",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000236"
+                "@id": "urn:nrel_example/nrel00000966"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001165"
+                "@id": "urn:nrel_example/nrel00000282"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000567"
+                "@id": "urn:nrel_example/nrel00000109"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000501"
+                "@value": "nrel00001079"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000761",
+        "@id": "urn:nrel_example/nrel00000567",
         "@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-FlowStatus"
+                "@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": "nrel00000761"
+                "@value": "nrel00000567"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000625",
+        "@id": "urn:nrel_example/nrel00001157",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -21687,152 +21921,130 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000625"
+                "@value": "nrel00001157"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000659",
+        "@id": "urn:nrel_example/nrel00000356",
         "@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": "nrel00000659"
+                "@value": "nrel00000356"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001287",
+        "@id": "urn:nrel_example/nrel00000190",
         "@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": "nrel00001287"
+                "@value": "nrel00000190"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000443",
+        "@id": "urn:nrel_example/nrel00000573",
         "@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:nrel_example/nrel00000941"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000443"
+                "@id": "urn:nrel_example/nrel00000121"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000354",
-        "@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-Air"
+                "@id": "urn:nrel_example/nrel00000404"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000354"
+                "@value": "nrel00000573"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000213",
+        "@id": "urn:nrel_example/nrel00000456",
         "@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": "nrel00000213"
+                "@value": "nrel00000456"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001025",
+        "@id": "urn:nrel_example/nrel00000985",
         "@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": "nrel00001025"
+                "@value": "nrel00000985"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001223",
+        "@id": "urn:nrel_example/nrel00001227",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000363"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000489"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001223"
+                "@value": "nrel00001227"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001302",
+        "@id": "urn:nrel_example/nrel00000245",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -21841,52 +22053,38 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001302"
+                "@value": "nrel00000245"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000346",
+        "@id": "urn:nrel_example/nrel00000493",
         "@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#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/nrel00000587"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000346"
+                "@id": "urn:nrel_example/nrel00000160"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000540",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000844"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000540"
+                "@value": "nrel00000493"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000567",
+        "@id": "urn:nrel_example/nrel00000475",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -21902,114 +22100,81 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000567"
+                "@value": "nrel00000475"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000098",
+        "@id": "urn:nrel_example/nrel00000612",
         "@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": "nrel00000612"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000602",
+        "@id": "urn:nrel_example/nrel00000210",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000032"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000358"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000602"
+                "@value": "nrel00000210"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000460",
+        "@id": "urn:nrel_example/nrel00000317",
         "@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#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000065"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001050"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001072"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001107"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000518"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000684"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000460"
+                "@value": "nrel00000317"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000778",
+        "@id": "urn:nrel_example/nrel00000154",
         "@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": "nrel00000778"
+                "@value": "nrel00000154"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000189",
+        "@id": "urn:nrel_example/nrel00001203",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -22018,49 +22183,44 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@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": "nrel00000189"
+                "@value": "nrel00001203"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000949",
+        "@id": "urn:nrel_example/nrel00000064",
         "@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/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": "nrel00000949"
+                "@value": "nrel00000064"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001180",
+        "@id": "urn:nrel_example/nrel00000783",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000172"
+                "@id": "urn:nrel_example/nrel00000970"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000984"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22068,77 +22228,85 @@
                 "@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/nrel00000885"
-            },
+                "@value": "nrel00000783"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001122",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001179"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001180"
+                "@value": "nrel00001122"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001159",
+        "@id": "urn:nrel_example/nrel00000836",
         "@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": "nrel00001159"
+                "@value": "nrel00000836"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001105",
+        "@id": "urn:nrel_example/nrel00000326",
         "@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": "nrel00001105"
+                "@value": "nrel00000326"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000518",
+        "@id": "urn:nrel_example/nrel00000307",
         "@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/nrel00000517"
             }
         ],
-        "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": "nrel00000518"
+                "@value": "nrel00000307"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000316",
+        "@id": "urn:nrel_example/nrel00000548",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -22147,335 +22315,300 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000316"
+                "@value": "nrel00000548"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000138",
+        "@id": "urn:nrel_example/nrel00000601",
         "@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": "nrel00000138"
+                "@value": "nrel00000601"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000537",
+        "@id": "urn:nrel_example/nrel00000414",
         "@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/nrel00000207"
             }
         ],
-        "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/nrel00001163"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000537"
+                "@value": "nrel00000414"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000707",
+        "@id": "urn:nrel_example/nrel00000726",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000735"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001172"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "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"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001237"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000707"
+                "@value": "nrel00000726"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000549",
+        "@id": "urn:nrel_example/nrel00001155",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000050"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000760"
+                "@id": "urn:nrel_example/nrel00000354"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000985"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000549"
+                "@value": "nrel00001155"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000737",
+        "@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-Water"
+                "@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": "nrel00000737"
+                "@value": "nrel00001274"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001140",
+        "@id": "urn:nrel_example/nrel00000283",
         "@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/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001140"
+                "@value": "nrel00000283"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001191",
+        "@id": "urn:nrel_example/nrel00000298",
         "@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": "nrel00001191"
+                "@value": "nrel00000298"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000735",
+        "@id": "urn:nrel_example/nrel00000538",
         "@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#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00000735"
+                "@id": "urn:nrel_example/nrel00000439"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000359",
-        "@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/ElectricCurrent"
+                "@id": "urn:nrel_example/nrel00000114"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "urn:nrel_example/nrel00000477"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000359"
+                "@value": "nrel00000538"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000175",
+        "@id": "urn:nrel_example/nrel00000747",
         "@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/nrel00000710"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000175"
+                "@value": "nrel00000747"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000511",
+        "@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": "nrel00000511"
+                "@value": "nrel00000832"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Default",
+        "@id": "urn:nrel_example/nrel00000682",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-            "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "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": "nrel00000682"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001160",
+        "@id": "urn:nrel_example/nrel00000486",
         "@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/nrel00001125"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00001160"
+                "@id": "urn:nrel_example/nrel00000500"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000632",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001280"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000632"
+                "@value": "nrel00000486"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000297",
+        "@id": "urn:nrel_example/nrel00000675",
         "@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/nrel00000574"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000691"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000347"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001153"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000297"
+                "@value": "nrel00000675"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000480",
+        "@id": "urn:nrel_example/nrel00000535",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000220"
+                "@id": "urn:nrel_example/nrel00000691"
             },
             {
-                "@id": "urn:nrel_example/nrel00000420"
+                "@id": "urn:nrel_example/nrel00000699"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22485,80 +22618,75 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000480"
+                "@value": "nrel00000535"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000486",
+        "@id": "urn:nrel_example/nrel00000295",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001125"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001280"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000486"
+                "@value": "nrel00000295"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000039",
+        "@id": "urn:nrel_example/nrel00000113",
         "@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/nrel00001226"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000933"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000039"
+                "@value": "nrel00000113"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001317",
+        "@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": "nrel00001317"
+                "@value": "nrel00000013"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000043",
+        "@id": "urn:nrel_example/nrel00000841",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -22569,12 +22697,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000043"
+                "@value": "nrel00000841"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000078",
+        "@id": "urn:nrel_example/nrel00001117",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -22585,30 +22713,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000078"
+                "@value": "nrel00001117"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000855",
+        "@id": "urn:nrel_example/nrel00001230",
         "@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": "nrel00000855"
+                "@value": "nrel00001230"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000093",
+        "@id": "urn:nrel_example/nrel00000432",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22617,377 +22750,408 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000093"
+                "@value": "nrel00000432"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000057",
+        "@id": "urn:nrel_example/nrel00000966",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "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-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000059"
+            },
             {
-                "@value": "nrel00000057"
+                "@id": "urn:nrel_example/nrel00000098"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000658"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001003",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00000050"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000853"
+                "@id": "urn:nrel_example/nrel00000109"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000845"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001003"
+                "@value": "nrel00000966"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000249",
+        "@id": "urn:nrel_example/nrel00000657",
         "@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/nrel00000779"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000912"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000767"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001133"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000249"
+                "@value": "nrel00000657"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000630",
+        "@id": "urn:nrel_example/nrel00000522",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000707"
+                "@id": "urn:nrel_example/nrel00000801"
             },
             {
-                "@id": "urn:nrel_example/nrel00001195"
+                "@id": "urn:nrel_example/nrel00000957"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000353"
+                "@id": "urn:nrel_example/nrel00000057"
             },
             {
-                "@id": "urn:nrel_example/nrel00000390"
+                "@id": "urn:nrel_example/nrel00000144"
             },
             {
-                "@id": "urn:nrel_example/nrel00001122"
+                "@id": "urn:nrel_example/nrel00000267"
             },
             {
-                "@id": "urn:nrel_example/nrel00001328"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000341"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000303"
+                "@id": "urn:nrel_example/nrel00000352"
             },
             {
-                "@id": "urn:nrel_example/nrel00000333"
+                "@id": "urn:nrel_example/nrel00000507"
             },
             {
-                "@id": "urn:nrel_example/nrel00000534"
+                "@id": "urn:nrel_example/nrel00000520"
             },
             {
-                "@id": "urn:nrel_example/nrel00000993"
+                "@id": "urn:nrel_example/nrel00000900"
             },
             {
-                "@id": "urn:nrel_example/nrel00001145"
+                "@id": "urn:nrel_example/nrel00001005"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001245"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000630"
+                "@value": "nrel00000522"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000005",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
+        "@type": [
+            "http://data.ashrae.org/standard223#Class",
+            "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
+            "http://www.w3.org/ns/shacl#NodeShape"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "EnumerationKind FlowStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001283",
         "@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": "nrel00000005"
+                "@value": "nrel00001283"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000406",
+        "@id": "urn:nrel_example/nrel00000514",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001211"
-            }
+            "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": "nrel00000406"
+                "@value": "nrel00000514"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001045",
+        "@id": "urn:nrel_example/nrel00000095",
         "@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/Frequency"
+                "@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://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000227"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001265"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@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": "nrel00001045"
+                "@value": "nrel00000095"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000294",
+        "@id": "urn:nrel_example/nrel00000690",
         "@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": "nrel00000294"
+                "@value": "nrel00000690"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000327",
+        "@id": "urn:nrel_example/nrel00001273",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000327"
+                "@value": "nrel00001273"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001185",
+        "@id": "urn:nrel_example/nrel00000837",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "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/nrel00000755"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001329"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000207"
-            },
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000864"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000443"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000709"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001163"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001185"
+                "@value": "nrel00000837"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000172",
+        "@id": "urn:nrel_example/nrel00000611",
         "@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/nrel00000351"
-            },
+                "@id": "urn:nrel_example/nrel00000590"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001180"
+                "@id": "urn:nrel_example/nrel00001121"
             }
         ],
-        "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": "nrel00000172"
+                "@value": "nrel00000611"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000614",
+        "@id": "urn:nrel_example/nrel00000705",
         "@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": "nrel00000614"
+                "@value": "nrel00000705"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000095",
+        "@id": "urn:nrel_example/nrel00000965",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000168"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000312"
-            },
+                "@id": "urn:nrel_example/nrel00000080"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000497"
-            },
+                "@id": "urn:nrel_example/nrel00000859"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000608"
-            },
+                "@id": "urn:nrel_example/nrel00000005"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000799"
+                "@value": "nrel00000965"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000413",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000227"
+                "@id": "urn:nrel_example/nrel00000927"
             },
             {
-                "@id": "urn:nrel_example/nrel00001265"
+                "@id": "urn:nrel_example/nrel00000950"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000042"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000726"
+                "@id": "urn:nrel_example/nrel00000013"
             },
             {
-                "@id": "urn:nrel_example/nrel00000809"
+                "@id": "urn:nrel_example/nrel00000103"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000095"
+                "@value": "nrel00000413"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000694",
+        "@id": "urn:nrel_example/nrel00000029",
         "@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/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000694"
+                "@value": "nrel00000029"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001290",
+        "@id": "urn:nrel_example/nrel00001218",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -22996,82 +23160,44 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001290"
+                "@value": "nrel00001218"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000225",
+        "@id": "urn:nrel_example/nrel00000772",
         "@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/nrel00000167"
             }
         ],
-        "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/nrel00000978"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000225"
+                "@value": "nrel00000772"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000777",
+        "@id": "urn:nrel_example/nrel00000045",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000776"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001164"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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": "nrel00000045"
             }
         ]
     },
@@ -23103,60 +23229,112 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000847",
+        "@id": "urn:nrel_example/nrel00000232",
         "@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": "nrel00000847"
+                "@value": "nrel00000232"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000011",
+        "@id": "urn:nrel_example/nrel00000246",
         "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000649"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@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": "nrel00000011"
+                "@value": "nrel00000246"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001146",
+        "@id": "urn:nrel_example/nrel00000427",
         "@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/ElectricPotential"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000427"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000779",
+        "@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": "nrel00000779"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000828",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000251"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000121"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00000071"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001146"
+                "@value": "nrel00000828"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000845",
+        "@id": "urn:nrel_example/nrel00001235",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -23172,414 +23350,463 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000845"
+                "@value": "nrel00001235"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000703",
+        "@id": "urn:nrel_example/nrel00001199",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#Pump"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000215"
+                "@id": "urn:nrel_example/nrel00000096"
             },
             {
-                "@id": "urn:nrel_example/nrel00001108"
+                "@id": "urn:nrel_example/nrel00001032"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000698"
+                "@id": "urn:nrel_example/nrel00000056"
             },
             {
-                "@id": "urn:nrel_example/nrel00001188"
+                "@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": "nrel00000703"
+                "@value": "nrel00001199"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000899",
+        "@id": "urn:nrel_example/nrel00000631",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000875"
+                "@id": "urn:nrel_example/nrel00000138"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001200"
             }
         ],
-        "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/nrel00000665"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001085"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000899"
+                "@value": "nrel00000631"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000510",
+        "@id": "urn:nrel_example/nrel00000431",
         "@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/nrel00000475"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000510"
+                "@value": "nrel00000431"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001178",
+        "@id": "urn:nrel_example/nrel00000323",
         "@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/nrel00000631"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000241"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000665"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001178"
+                "@value": "nrel00000323"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000851",
+        "@id": "urn:nrel_example/nrel00001319",
         "@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": "nrel00000851"
+                "@value": "nrel00001319"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000646",
+        "@id": "urn:nrel_example/nrel00000319",
         "@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": "nrel00000646"
+                "@value": "nrel00000319"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000278",
+        "@id": "urn:nrel_example/nrel00001046",
         "@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": "nrel00000278"
+                "@value": "nrel00001046"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000321",
+        "@id": "urn:nrel_example/nrel00001325",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000724"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000802"
+            }
         ],
         "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": "nrel00000321"
+                "@value": "nrel00001325"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000859",
+        "@id": "urn:nrel_example/nrel00001151",
         "@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/nrel00000080"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000284"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000987"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000859"
+                "@value": "nrel00001151"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000574",
+        "@id": "urn:nrel_example/nrel00000408",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001211"
-            }
-        ],
         "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": "nrel00000574"
+                "@value": "nrel00000408"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000996",
+        "@id": "urn:nrel_example/nrel00000516",
         "@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": "nrel00000996"
+                "@value": "nrel00000516"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000363",
+        "@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": "nrel00000363"
+                "@value": "nrel00001279"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001254",
+        "@id": "urn:nrel_example/nrel00000555",
         "@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#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000688"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000967"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000176"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000865"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001221"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001254"
+                "@value": "nrel00000555"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000927",
+        "@id": "urn:nrel_example/nrel00000964",
         "@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": "nrel00000927"
+                "@value": "nrel00000964"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000767",
+        "@id": "urn:nrel_example/nrel00000655",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "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#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000688"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000767"
+                "@value": "nrel00000655"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001257",
+        "@id": "urn:nrel_example/nrel00000011",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://www.w3.org/2002/07/owl#Ontology"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@value": "nrel00000011"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000318",
+        "@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/A"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001257"
+                "@value": "nrel00000318"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000104",
+        "@id": "urn:nrel_example/nrel00000296",
         "@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": "nrel00000104"
+                "@value": "nrel00000296"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001002",
+        "@id": "urn:nrel_example/nrel00000258",
         "@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/nrel00000459"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001007"
             }
         ],
-        "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": "nrel00001002"
+                "@value": "nrel00000258"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000553",
+        "@id": "urn:nrel_example/nrel00000630",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
+                "@id": "urn:nrel_example/nrel00000707"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001195"
+            }
+        ],
+        "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/nrel00001328"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000555"
+                "@id": "urn:nrel_example/nrel00000303"
             },
             {
-                "@id": "urn:nrel_example/nrel00000930"
+                "@id": "urn:nrel_example/nrel00000333"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000534"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000993"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001145"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000553"
+                "@value": "nrel00000630"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000082",
+        "@id": "urn:nrel_example/nrel00000924",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -23590,246 +23817,231 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000082"
+                "@value": "nrel00000924"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001047",
+        "@id": "urn:nrel_example/nrel00000469",
         "@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": "nrel00001047"
+                "@value": "nrel00000469"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000717",
+        "@id": "urn:nrel_example/nrel00000781",
         "@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"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001167"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000717"
+                "@value": "nrel00000781"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001320",
+        "@id": "urn:nrel_example/nrel00000929",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000792"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000825"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001320"
+                "@value": "nrel00000929"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000091",
+        "@id": "urn:nrel_example/nrel00000260",
         "@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": "nrel00000091"
+                "@value": "nrel00000260"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000471",
+        "@id": "urn:nrel_example/nrel00000134",
         "@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": "nrel00000471"
+                "@value": "nrel00000134"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000780",
+        "@id": "urn:nrel_example/nrel00001300",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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": "nrel00001300"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000668",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000780"
+                "@value": "nrel00000668"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000274",
+        "@id": "urn:nrel_example/nrel00000450",
         "@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": "nrel00000274"
+                "@value": "nrel00000450"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000531",
+        "@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/nrel00001023"
+                "@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/nrel00001138"
+                "@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": "nrel00000531"
+                "@value": "nrel00000782"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001040",
+        "@id": "urn:nrel_example/nrel00000597",
         "@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": "nrel00001040"
+                "@value": "nrel00000597"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000888",
+        "@id": "urn:nrel_example/nrel00000177",
         "@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": "nrel00000888"
+                "@value": "nrel00000177"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001097",
+        "@id": "urn:nrel_example/nrel00000863",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -23840,96 +24052,67 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001097"
+                "@value": "nrel00000863"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001312",
+        "@id": "urn:nrel_example/nrel00000639",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000818"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000336"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001130"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001312"
+                "@value": "nrel00000639"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001092",
+        "@id": "urn:nrel_example/nrel00000126",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000539"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000763"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000436"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001225"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001092"
+                "@value": "nrel00000126"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000148",
+        "@id": "urn:nrel_example/nrel00001018",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001046"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001067"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000148"
+                "@value": "nrel00001018"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000902",
+        "@id": "urn:nrel_example/nrel00000050",
         "@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#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -23938,270 +24121,289 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000902"
+                "@value": "nrel00000050"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000229",
+        "@id": "urn:nrel_example/nrel00000106",
         "@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": "nrel00000229"
+                "@value": "nrel00000106"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000954",
+        "@id": "urn:nrel_example/nrel00000613",
         "@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-RunStatus"
+                "@id": "urn:nrel_example/nrel00000093"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000894"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000952"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001088"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000954"
+                "@value": "nrel00000613"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001222",
+        "@id": "urn:nrel_example/nrel00000467",
         "@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": "nrel00001222"
+                "@value": "nrel00000467"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001295",
+        "@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/RelativeHumidity"
+                "@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/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000194"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000299"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001295"
+                "@value": "nrel00000205"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001261",
+        "@id": "urn:nrel_example/nrel00000119",
         "@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": "nrel00001261"
+                "@value": "nrel00000119"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001075",
+        "@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": "nrel00001075"
+                "@value": "nrel00000503"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000396",
+        "@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/nrel00000278"
+                "@id": "urn:nrel_example/nrel00000107"
             },
             {
-                "@id": "urn:nrel_example/nrel00000603"
+                "@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": "nrel00000396"
+                "@value": "nrel00001087"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000658",
+        "@id": "urn:nrel_example/nrel00000977",
         "@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": "nrel00000658"
+                "@value": "nrel00000977"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000170",
+        "@id": "urn:nrel_example/nrel00000591",
         "@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/ElectricPower"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000039"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@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": "nrel00000170"
+                "@id": "urn:nrel_example/nrel00000200"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000306"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001136"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001226"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000389",
-        "@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/nrel00000933"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001255"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000389"
+                "@value": "nrel00000591"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000806",
+        "@id": "urn:nrel_example/nrel00000381",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000049"
+            },
             {
-                "@value": "nrel00000806"
+                "@id": "urn:nrel_example/nrel00000582"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000657"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000277",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000165"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001040"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001074"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001279"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000277"
+                "@id": "urn:nrel_example/nrel00000175"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000571"
             }
-        ]
-    },
-    {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Overridden",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-            "http://data.ashrae.org/standard223#EnumerationKind-Override"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@language": "en",
-                "@value": "AlarmStatus-Ok"
-            },
-            {
-                "@language": "en",
-                "@value": "Override-Overridden"
+                "@value": "nrel00000381"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000992",
+        "@id": "urn:nrel_example/nrel00000330",
         "@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/nrel00000211"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000034"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000992"
+                "@value": "nrel00000330"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000880",
+        "@id": "urn:nrel_example/nrel00000753",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -24212,562 +24414,519 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000880"
+                "@value": "nrel00000753"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000373",
+        "@id": "urn:nrel_example/nrel00000173",
         "@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": "nrel00000373"
+                "@value": "nrel00000173"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000037",
+        "@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-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000037"
+                "@value": "nrel00001072"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001253",
+        "@id": "urn:nrel_example/nrel00000292",
         "@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/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": "nrel00000292"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000605",
+        "@id": "urn:nrel_example/nrel00001288",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000151"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001229"
+                "@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": "nrel00000605"
+                "@value": "nrel00001288"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000378",
+        "@id": "urn:nrel_example/nrel00000028",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000220"
-            }
+            "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/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000284"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000378"
+                "@value": "nrel00000028"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001033",
+        "@id": "urn:nrel_example/nrel00000321",
         "@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/nrel00001123"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001033"
+                "@value": "nrel00000321"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000607",
+        "@id": "urn:nrel_example/nrel00000623",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000607"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000840",
-        "@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-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000840"
+                "@value": "nrel00000623"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000017",
+        "@id": "urn:nrel_example/nrel00000802",
         "@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": "nrel00000017"
+                "@value": "nrel00000802"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000889",
+        "@id": "urn:nrel_example/nrel00000882",
         "@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": "nrel00000889"
+                "@value": "nrel00000882"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000154",
+        "@id": "urn:nrel_example/nrel00000170",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000154"
+                "@value": "nrel00000170"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000168",
+        "@id": "urn:nrel_example/nrel00000312",
         "@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/nrel00001265"
+                "@id": "urn:nrel_example/nrel00000869"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001228"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000042"
+                "@id": "urn:nrel_example/nrel00000047"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000196"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000168"
+                "@value": "nrel00000312"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000046",
+        "@id": "urn:nrel_example/nrel00001303",
         "@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/nrel00000622"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000682"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000286"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000679"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000046"
+                "@value": "nrel00001303"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001078",
+        "@id": "urn:nrel_example/nrel00000186",
         "@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/nrel00001077"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000186"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000876",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000272"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001078"
+                "@value": "nrel00000876"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001236",
+        "@id": "urn:nrel_example/nrel00000228",
         "@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": "nrel00001236"
+                "@value": "nrel00000228"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000634",
+        "@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": "nrel00000634"
+                "@value": "nrel00001257"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000666",
+        "@id": "urn:nrel_example/nrel00000556",
         "@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": "nrel00000666"
+                "@value": "nrel00000556"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000981",
+        "@id": "urn:nrel_example/nrel00000771",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000307"
+            },
             {
-                "@value": "nrel00000981"
+                "@id": "urn:nrel_example/nrel00000699"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001091",
-        "@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-Water"
+                "@id": "urn:nrel_example/nrel00000154"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001091"
+                "@value": "nrel00000771"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000848",
+        "@id": "urn:nrel_example/nrel00000649",
         "@type": [
-            "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#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000146"
+                "@id": "urn:nrel_example/nrel00000364"
             },
             {
-                "@id": "urn:nrel_example/nrel00000570"
+                "@id": "urn:nrel_example/nrel00000516"
             },
             {
-                "@id": "urn:nrel_example/nrel00001013"
+                "@id": "urn:nrel_example/nrel00000893"
             },
             {
-                "@id": "urn:nrel_example/nrel00001323"
+                "@id": "urn:nrel_example/nrel00001139"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000511"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000727"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00000774"
-            },
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001184"
+                "@id": "urn:nrel_example/nrel00000182"
             },
             {
-                "@id": "urn:nrel_example/nrel00001287"
+                "@id": "urn:nrel_example/nrel00001178"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000848"
+                "@value": "nrel00000649"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000775",
+        "@id": "urn:nrel_example/nrel00000401",
         "@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": "nrel00000775"
+                "@value": "nrel00000401"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000516",
+        "@id": "urn:nrel_example/nrel00000289",
         "@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": "nrel00000516"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001124",
-        "@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/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001124"
+                "@value": "nrel00000289"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000864",
+        "@id": "urn:nrel_example/nrel00000504",
         "@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": "nrel00000864"
+                "@value": "nrel00000504"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000476",
+        "@id": "urn:nrel_example/nrel00000284",
         "@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/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000476"
+                "@value": "nrel00000284"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000144",
+        "@id": "urn:nrel_example/nrel00000485",
         "@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": "nrel00000144"
+                "@value": "nrel00000485"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000123",
+        "@id": "urn:nrel_example/nrel00000790",
         "@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#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000440"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000689"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000123"
+                "@value": "nrel00000790"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000332",
+        "@id": "urn:nrel_example/nrel00000166",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24783,98 +24942,107 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000332"
+                "@value": "nrel00000166"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000494",
+        "@id": "urn:nrel_example/nrel00001198",
         "@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/nrel00001023"
+                "@id": "urn:nrel_example/nrel00000461"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001166"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000081"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000494"
+                "@value": "nrel00001198"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001318",
+        "@id": "urn:nrel_example/nrel00000046",
         "@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/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000335"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001318"
+                "@value": "nrel00000046"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000479",
+        "@id": "urn:nrel_example/nrel00000702",
         "@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/ElectricPower"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000702"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000625",
+        "@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/KiloW"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000479"
+                "@value": "nrel00000625"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000869",
+        "@id": "urn:nrel_example/nrel00000653",
         "@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": "nrel00000869"
+                "@value": "nrel00000653"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000997",
+        "@id": "urn:nrel_example/nrel00000143",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -24883,12 +25051,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000997"
+                "@value": "nrel00000143"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000709",
+        "@id": "urn:nrel_example/nrel00000930",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24904,65 +25072,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000709"
+                "@value": "nrel00000930"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000224",
+        "@id": "urn:nrel_example/nrel00001138",
         "@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": "nrel00000224"
+                "@value": "nrel00001138"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000964",
+        "@id": "urn:nrel_example/nrel00000991",
         "@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#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000964"
+                "@value": "nrel00000991"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001016",
+        "@id": "urn:nrel_example/nrel00000359",
         "@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": "nrel00001016"
+                "@value": "nrel00000359"
             }
         ]
     },
@@ -24983,25 +25156,9 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000219",
-        "@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": "nrel00000219"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000347",
+        "@id": "urn:nrel_example/nrel00000598",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -25010,49 +25167,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000347"
+                "@value": "nrel00000598"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000884",
+        "@id": "urn:nrel_example/nrel00001123",
         "@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": "nrel00000884"
+                "@value": "nrel00001123"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000662",
+        "@id": "urn:nrel_example/nrel00000963",
         "@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/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000662"
+                "@value": "nrel00000963"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001324",
+        "@id": "urn:nrel_example/nrel00001238",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -25068,97 +25225,102 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001324"
+                "@value": "nrel00001238"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000337",
+        "@id": "urn:nrel_example/nrel00000883",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000469"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000509"
+                "@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/nrel00000119"
-            },
+                "@value": "nrel00000883"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001224",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000671"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000337"
+                "@value": "nrel00001224"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000127",
+        "@id": "urn:nrel_example/nrel00001309",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000631"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000241"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001085"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000127"
+                "@value": "nrel00001309"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000756",
+        "@id": "urn:nrel_example/nrel00001298",
         "@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": "nrel00000756"
+                "@value": "nrel00001298"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001062",
+        "@id": "urn:nrel_example/nrel00000103",
         "@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": "nrel00001062"
+                "@value": "nrel00000103"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001161",
+        "@id": "urn:nrel_example/nrel00000227",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -25169,144 +25331,177 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001161"
+                "@value": "nrel00000227"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000749",
+        "@id": "urn:nrel_example/nrel00001327",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000715"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000946"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000749"
+                "@value": "nrel00001327"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000692",
+        "@id": "urn:nrel_example/nrel00000301",
         "@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": "nrel00000692"
+                "@value": "nrel00000301"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001064",
+        "@id": "urn:nrel_example/nrel00000870",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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-Air"
+                "@id": "urn:nrel_example/nrel00000901"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000975"
+            }
+        ],
+        "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"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001253"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001310"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001064"
+                "@value": "nrel00000870"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000450",
+        "@id": "urn:nrel_example/nrel00000956",
         "@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": "nrel00000450"
+                "@value": "nrel00000956"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000846",
+        "@id": "urn:nrel_example/nrel00000999",
         "@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": "nrel00000846"
+                "@value": "nrel00000999"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001012",
+        "@id": "urn:nrel_example/nrel00000642",
         "@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/nrel00001299"
+                "@id": "urn:nrel_example/nrel00000586"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000923"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000166"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001012"
+                "@value": "nrel00000642"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001241",
+        "@id": "urn:nrel_example/nrel00000767",
         "@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": "nrel00001241"
+                "@value": "nrel00000767"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000619",
+        "@id": "urn:nrel_example/nrel00000590",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -25317,59 +25512,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000619"
+                "@value": "nrel00000590"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000624",
+        "@id": "urn:nrel_example/nrel00000163",
         "@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": "nrel00000624"
+                "@value": "nrel00000163"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001114",
+        "@id": "urn:nrel_example/nrel00000276",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001086"
-            }
+            "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/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000471"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001114"
+                "@value": "nrel00000276"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000552",
+        "@id": "urn:nrel_example/nrel00000936",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -25385,267 +25575,181 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000552"
+                "@value": "nrel00000936"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000477",
+        "@id": "urn:nrel_example/nrel00000263",
         "@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": "nrel00000477"
-            }
-        ]
-    },
-    {
-        "@id": "http://data.ashrae.org/standard223#HeatRecoveryCoil",
-        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Coil"
+                "@value": "nrel00000263"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000235",
+        "@id": "urn:nrel_example/nrel00001202",
         "@type": [
-            "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/nrel00001161"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001311"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000231"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000294"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000575"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000766"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000835"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000951"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001177"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001202"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001216"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001281"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001332"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000235"
+                "@value": "nrel00001202"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000990",
+        "@id": "urn:nrel_example/nrel00000996",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000990"
+                "@value": "nrel00000996"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000195",
+        "@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": "nrel00000195"
+                "@value": "nrel00000951"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001096",
+        "@id": "urn:nrel_example/nrel00000451",
         "@type": [
-            "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#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"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001096"
+                "@value": "nrel00000451"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000606",
+        "@id": "urn:nrel_example/nrel00001130",
         "@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": "nrel00000606"
+                "@value": "nrel00001130"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001127",
+        "@id": "urn:nrel_example/nrel00000719",
         "@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": "nrel00001127"
+                "@value": "nrel00000719"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000478",
+        "@id": "urn:nrel_example/nrel00001029",
         "@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/nrel00000388"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000345"
+                "@id": "urn:nrel_example/nrel00000673"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000478"
+                "@value": "nrel00001029"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001006",
+        "@id": "urn:nrel_example/nrel00001012",
         "@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#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00001006"
+                "@id": "urn:nrel_example/nrel00001299"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001233",
-        "@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-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000166"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001233"
+                "@value": "nrel00001012"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000191",
+        "@id": "urn:nrel_example/nrel00001261",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -25661,35 +25765,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000191"
+                "@value": "nrel00001261"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000456",
+        "@id": "urn:nrel_example/nrel00000488",
         "@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": "nrel00000456"
+                "@value": "nrel00000488"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001269",
+        "@id": "urn:nrel_example/nrel00000855",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -25698,93 +25802,110 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001269"
+                "@value": "nrel00000855"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000377",
+        "@id": "urn:nrel_example/nrel00000827",
         "@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-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@value": "nrel00000827"
+            }
+        ]
+    },
+    {
+        "@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-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000377"
+                "@value": "nrel00000775"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001255",
+        "@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/Temperature"
+                "@id": "urn:nrel_example/nrel00000967"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000865"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001255"
+                "@value": "nrel00000524"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000218",
+        "@id": "urn:nrel_example/nrel00000123",
         "@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/Energy"
+                "@id": "urn:nrel_example/nrel00000290"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001091"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000440"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000689"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000218"
+                "@value": "nrel00000123"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000897",
+        "@id": "urn:nrel_example/nrel00000676",
         "@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": "nrel00000897"
+                "@value": "nrel00000676"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000331",
+        "@id": "urn:nrel_example/nrel00000873",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -25793,93 +25914,77 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000331"
+                "@value": "nrel00000873"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000242",
+        "@id": "urn:nrel_example/nrel00000443",
         "@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": "nrel00000443"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000785",
+        "@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-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000785"
+                "@value": "nrel00001124"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001206",
+        "@id": "urn:nrel_example/nrel00001236",
         "@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": "nrel00001236"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000521",
+        "@id": "urn:nrel_example/nrel00000424",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000354"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000139"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "nrel00000521"
+                "@id": "urn:nrel_example/nrel00000077"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001135",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -25888,86 +25993,65 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001135"
+                "@value": "nrel00000424"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000113",
+        "@id": "urn:nrel_example/nrel00000949",
         "@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": "nrel00000113"
+                "@value": "nrel00000949"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000651",
+        "@id": "urn:nrel_example/nrel00000224",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000651"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000399",
-        "@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/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000399"
+                "@value": "nrel00000224"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001229",
+        "@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-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001229"
+                "@value": "nrel00000793"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000641",
+        "@id": "urn:nrel_example/nrel00001204",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -25983,54 +26067,52 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000641"
+                "@value": "nrel00001204"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000019",
+        "@id": "urn:nrel_example/nrel00000149",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000211"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000942"
+            }
         ],
         "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": "nrel00000019"
+                "@value": "nrel00000149"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000483",
+        "@id": "urn:nrel_example/nrel00000971",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000862"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000464"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001134"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000483"
+                "@value": "nrel00000971"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000665",
+        "@id": "urn:nrel_example/nrel00000002",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -26046,477 +26128,452 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000665"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000427",
-        "@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": "nrel00000427"
+                "@value": "nrel00000002"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000591",
+        "@id": "urn:nrel_example/nrel00000765",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000039"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000416"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000604"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000200"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000306"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001136"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001226"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000933"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001255"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000591"
+                "@value": "nrel00000765"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000823",
+        "@id": "urn:nrel_example/nrel00000378",
         "@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/nrel00000220"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@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": "nrel00000823"
+                "@value": "nrel00000378"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001208",
+        "@id": "urn:nrel_example/nrel00000279",
         "@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": "nrel00001208"
+                "@value": "nrel00000279"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000550",
+        "@id": "urn:nrel_example/nrel00000370",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000550"
+                "@value": "nrel00000370"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001155",
+        "@id": "urn:nrel_example/nrel00000133",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@id": "urn:nrel_example/nrel00000432"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000985"
+                "@id": "urn:nrel_example/nrel00001235"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001155"
+                "@value": "nrel00000133"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000667",
+        "@id": "urn:nrel_example/nrel00000849",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000443"
+                "@id": "urn:nrel_example/nrel00000048"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000667"
+                "@value": "nrel00000849"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001244",
+        "@id": "urn:nrel_example/nrel00000261",
         "@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-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001244"
+                "@value": "nrel00000261"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001294",
+        "@id": "urn:nrel_example/nrel00000127",
         "@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/nrel00000631"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000241"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001085"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001294"
+                "@value": "nrel00000127"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000160",
+        "@id": "urn:nrel_example/nrel00000135",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000587"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000340"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000225"
+                "@id": "urn:nrel_example/nrel00000734"
             },
             {
-                "@id": "urn:nrel_example/nrel00001286"
+                "@id": "urn:nrel_example/nrel00000906"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000160"
+                "@id": "urn:nrel_example/nrel00000051"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000075"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000914"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001250"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000986",
-        "@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/nrel00000202"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000740"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000986"
+                "@value": "nrel00000135"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000508",
+        "@id": "urn:nrel_example/nrel00000288",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "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"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000508"
+                "@value": "nrel00000288"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000597",
+        "@id": "urn:nrel_example/nrel00000102",
         "@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": "nrel00000597"
+                "@value": "nrel00000102"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000177",
+        "@id": "urn:nrel_example/nrel00001040",
         "@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": "nrel00000177"
+                "@value": "nrel00001040"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000272",
+        "@id": "urn:nrel_example/nrel00000497",
         "@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/nrel00001265"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000726"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000272"
+                "@value": "nrel00000497"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000920",
+        "@id": "urn:nrel_example/nrel00001114",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000638"
+                "@id": "urn:nrel_example/nrel00001086"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000336"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000412"
+                "@id": "urn:nrel_example/nrel00000471"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000920"
+                "@value": "nrel00001114"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000708",
+        "@id": "urn:nrel_example/nrel00000060",
         "@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:nrel_example/nrel00000939"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000345"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000866"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000708"
+                "@value": "nrel00000060"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000110",
+        "@id": "urn:nrel_example/nrel00000730",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000634"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001137"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000110"
+                "@value": "nrel00000730"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000930",
+        "@id": "urn:nrel_example/nrel00000117",
         "@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/nrel00000966"
             }
         ],
-        "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/nrel00000282"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000845"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000930"
+                "@value": "nrel00000117"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001067",
+        "@id": "urn:nrel_example/nrel00000072",
         "@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": "nrel00001067"
+                "@value": "nrel00000072"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001035",
+        "@id": "urn:nrel_example/nrel00000239",
         "@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": "nrel00001035"
+                "@value": "nrel00000239"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001042",
+        "@id": "urn:nrel_example/nrel00001284",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000530"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000834"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000606"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001124"
+                "@id": "urn:nrel_example/nrel00000961"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001042"
+                "@value": "nrel00001284"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001225",
+        "@id": "urn:nrel_example/nrel00001030",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -26525,453 +26582,503 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001225"
+                "@value": "nrel00001030"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000340",
+        "@id": "urn:nrel_example/nrel00000255",
         "@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/nrel00000051"
+                "@id": "urn:nrel_example/nrel00000397"
             }
         ],
-        "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": "nrel00000255"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000288",
+        "@id": "urn:nrel_example/nrel00000773",
         "@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": "nrel00000288"
+                "@value": "nrel00000773"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000364",
+        "@id": "urn:nrel_example/nrel00000464",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "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/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": "nrel00000364"
+                "@value": "nrel00000464"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001108",
+        "@id": "urn:nrel_example/nrel00000529",
         "@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": "nrel00001108"
+                "@value": "nrel00000529"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000155",
+        "@id": "urn:nrel_example/nrel00001162",
         "@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/nrel00000862"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000069"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "urn:nrel_example/nrel00000482"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000417"
+                "@id": "urn:nrel_example/nrel00000111"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001319"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000155"
+                "@value": "nrel00001162"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000893",
+        "@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://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000708"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000866"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000893"
+                "@value": "nrel00001243"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001101",
+        "@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/nrel00000806"
+                "@id": "urn:nrel_example/nrel00000466"
             },
             {
-                "@id": "urn:nrel_example/nrel00000864"
+                "@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": "nrel00001101"
+                "@value": "nrel00001197"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000258",
+        "@id": "urn:nrel_example/nrel00001027",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000459"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00001007"
+                "@id": "urn:nrel_example/nrel00000122"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000206"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000537"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000258"
+                "@value": "nrel00001027"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000984",
+        "@id": "urn:nrel_example/nrel00000851",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "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": "nrel00000984"
+                "@value": "nrel00000851"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000663",
+        "@id": "urn:nrel_example/nrel00000081",
         "@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": "nrel00000663"
+                "@value": "nrel00000081"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000538",
+        "@id": "urn:nrel_example/nrel00000895",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000439"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000477"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000538"
+                "@value": "nrel00000895"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001076",
+        "@id": "urn:nrel_example/nrel00000482",
         "@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": "nrel00001076"
+                "@value": "nrel00000482"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001221",
+        "@id": "urn:nrel_example/nrel00000795",
         "@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": "nrel00001221"
+                "@value": "nrel00000795"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001020",
+        "@id": "urn:nrel_example/nrel00000925",
         "@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/nrel00000441"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000118"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001020"
+                "@value": "nrel00000925"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000878",
+        "@id": "urn:nrel_example/nrel00000297",
         "@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": "nrel00000878"
+                "@value": "nrel00000297"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000782",
+        "@id": "urn:nrel_example/nrel00000160",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000148"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000647"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00001037"
+                "@id": "urn:nrel_example/nrel00000587"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000190"
-            },
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000722"
+                "@id": "urn:nrel_example/nrel00000225"
             },
             {
-                "@id": "urn:nrel_example/nrel00001046"
-            },
+                "@id": "urn:nrel_example/nrel00001286"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001052"
+                "@value": "nrel00000160"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000586",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000820"
-            },
+                "@id": "urn:nrel_example/nrel00000642"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001067"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000782"
+                "@value": "nrel00000586"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000867",
+        "@id": "urn:nrel_example/nrel00000447",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
-            {
-                "@id": "urn:nrel_example/nrel00000080"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000122"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000587"
+                "@id": "urn:nrel_example/nrel00000660"
             },
             {
-                "@id": "urn:nrel_example/nrel00000600"
+                "@id": "urn:nrel_example/nrel00000899"
             },
             {
-                "@id": "urn:nrel_example/nrel00000631"
+                "@id": "urn:nrel_example/nrel00001166"
             },
             {
-                "@id": "urn:nrel_example/nrel00000736"
-            },
+                "@id": "urn:nrel_example/nrel00001240"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000862"
+                "@id": "urn:nrel_example/nrel00000199"
             },
             {
-                "@id": "urn:nrel_example/nrel00001125"
+                "@id": "urn:nrel_example/nrel00000542"
             },
             {
-                "@id": "urn:nrel_example/nrel00001197"
+                "@id": "urn:nrel_example/nrel00000585"
             },
             {
-                "@id": "urn:nrel_example/nrel00001267"
+                "@id": "urn:nrel_example/nrel00001061"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000867"
+                "@value": "nrel00000447"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000582",
+        "@id": "urn:nrel_example/nrel00000741",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001040"
+                "@id": "urn:nrel_example/nrel00000463"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000571"
+                "@id": "urn:nrel_example/nrel00001307"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000582"
+                "@value": "nrel00000741"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000345",
+        "@id": "urn:nrel_example/nrel00001244",
         "@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/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
-        "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": "nrel00001244"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000422",
+        "@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": "nrel00000345"
+                "@value": "nrel00000422"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000253",
+        "@id": "urn:nrel_example/nrel00000650",
         "@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": "nrel00000253"
+                "@value": "nrel00000650"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000720",
+        "@id": "urn:nrel_example/nrel00000466",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -26980,175 +27087,222 @@
                 "@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": "nrel00000466"
+            }
+        ]
+    },
+    {
+        "@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"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000720"
+                "@value": "nrel00000822"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000247",
+        "@id": "urn:nrel_example/nrel00000222",
         "@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/nrel00001105"
+                "@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/nrel00000859"
+                "@value": "nrel00000222"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001088",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000987"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000247"
+                "@value": "nrel00001088"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000850",
+        "@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": "nrel00000850"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000290",
+        "@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": "nrel00000290"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000182",
+        "@id": "urn:nrel_example/nrel00000872",
         "@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/nrel00001234"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001298"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001209"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001251"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000182"
+                "@value": "nrel00000872"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001133",
+        "@id": "urn:nrel_example/nrel00000030",
         "@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": "nrel00001133"
+                "@value": "nrel00000030"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000958",
+        "@id": "urn:nrel_example/nrel00000665",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000152"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000521"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000591"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000628"
-            },
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001155"
+                "@value": "nrel00000665"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000830",
+        "@type": [
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000208"
+                "@id": "urn:nrel_example/nrel00000252"
             },
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@id": "urn:nrel_example/nrel00001159"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000139"
+                "@id": "urn:nrel_example/nrel00000238"
             },
             {
-                "@id": "urn:nrel_example/nrel00000823"
+                "@id": "urn:nrel_example/nrel00000359"
             },
             {
-                "@id": "urn:nrel_example/nrel00000985"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000958"
-            }
-        ]
-    },
-    {
-        "@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/nrel00000427"
             },
             {
-                "@id": "urn:nrel_example/nrel00000593"
+                "@id": "urn:nrel_example/nrel00000645"
             },
             {
-                "@id": "urn:nrel_example/nrel00000772"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000791"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000151"
+                "@id": "urn:nrel_example/nrel00000861"
             },
             {
-                "@id": "urn:nrel_example/nrel00000167"
+                "@id": "urn:nrel_example/nrel00000880"
             },
             {
-                "@id": "urn:nrel_example/nrel00000432"
+                "@id": "urn:nrel_example/nrel00000977"
             },
             {
-                "@id": "urn:nrel_example/nrel00000991"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00001019"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000978"
+                "@id": "urn:nrel_example/nrel00001048"
             },
             {
-                "@id": "urn:nrel_example/nrel00001235"
+                "@id": "urn:nrel_example/nrel00001217"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000084"
+                "@value": "nrel00000830"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000111",
+        "@id": "urn:nrel_example/nrel00000606",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -27157,36 +27311,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000111"
+                "@value": "nrel00000606"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000822",
+        "@id": "urn:nrel_example/nrel00000585",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000355"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000438"
+                "@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": "nrel00000822"
+                "@value": "nrel00000585"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001074",
+        "@id": "urn:nrel_example/nrel00000760",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -27197,196 +27348,186 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001074"
+                "@value": "nrel00000760"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001239",
+        "@id": "urn:nrel_example/nrel00000921",
         "@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": "nrel00001239"
+                "@value": "nrel00000921"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001001",
+        "@id": "urn:nrel_example/nrel00000465",
         "@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": "nrel00001001"
+                "@value": "nrel00000465"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001265",
+        "@id": "urn:nrel_example/nrel00000374",
         "@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/nrel00000001"
+            },
             {
-                "@value": "nrel00001265"
+                "@id": "urn:nrel_example/nrel00000219"
             }
-        ]
-    },
-    {
-        "@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-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00001047"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000076"
+                "@value": "nrel00000374"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000611",
+        "@id": "urn:nrel_example/nrel00001089",
         "@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/nrel00000590"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000351"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001121"
+                "@id": "urn:nrel_example/nrel00000618"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000821"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001304"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000009"
+                "@id": "urn:nrel_example/nrel00000315"
+            },
+            {
+                "@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": "nrel00000611"
+                "@value": "nrel00001089"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000953",
+        "@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": "nrel00000953"
+                "@value": "nrel00000874"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000557",
+        "@id": "urn:nrel_example/nrel00000671",
         "@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": "nrel00000557"
+                "@value": "nrel00000671"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000185",
+        "@id": "urn:nrel_example/nrel00001059",
         "@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": "nrel00001059"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001169",
+        "@id": "urn:nrel_example/nrel00000909",
         "@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/nrel00000658"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000635"
+                "@id": "urn:nrel_example/nrel00000282"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000091"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001169"
+                "@value": "nrel00000909"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001126",
+        "@id": "urn:nrel_example/nrel00000085",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27402,12 +27543,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001126"
+                "@value": "nrel00000085"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000512",
+        "@id": "urn:nrel_example/nrel00000215",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -27418,41 +27559,46 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000512"
+                "@value": "nrel00000215"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000083",
+        "@id": "urn:nrel_example/nrel00001229",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000437"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001104"
+                "@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/nrel00001026"
-            },
+                "@value": "nrel00001229"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001182",
+        "@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": "nrel00001182"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000087",
+        "@id": "urn:nrel_example/nrel00000976",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27461,28 +27607,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000087"
+                "@value": "nrel00000976"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000392",
+        "@id": "urn:nrel_example/nrel00000569",
         "@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": "nrel00000392"
+                "@value": "nrel00000569"
             }
         ]
     },
@@ -27503,91 +27649,54 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000917",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000948"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000124"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000917"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000094",
+        "@id": "urn:nrel_example/nrel00000739",
         "@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": "nrel00000094"
+                "@value": "nrel00000739"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001165",
+        "@id": "urn:nrel_example/nrel00000875",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:nrel_example/nrel00001267"
-            }
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000567"
+                "@id": "urn:nrel_example/nrel00000107"
             },
             {
-                "@id": "urn:nrel_example/nrel00000637"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001165"
+                "@id": "urn:nrel_example/nrel00000899"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000660",
-        "@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": "nrel00000660"
+                "@value": "nrel00000875"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000931",
+        "@id": "urn:nrel_example/nrel00001256",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
@@ -27601,161 +27710,115 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000931"
+                "@value": "nrel00001256"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000470",
+        "@id": "urn:nrel_example/nrel00000018",
         "@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"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "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": "nrel00000470"
+                "@value": "nrel00000018"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000422",
+        "@id": "urn:nrel_example/nrel00001262",
         "@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": "nrel00000422"
+                "@value": "nrel00001262"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000674",
+        "@id": "urn:nrel_example/nrel00000923",
         "@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/nrel00000642"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "nrel00000674"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000983",
-        "@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/nrel00000067"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000983"
+                "@value": "nrel00000923"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000895",
+        "@id": "urn:nrel_example/nrel00000708",
         "@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/Temperature"
+                "@id": "urn:nrel_example/nrel00000939"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000345"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000866"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000895"
+                "@value": "nrel00000708"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000729",
+        "@id": "urn:nrel_example/nrel00000105",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000018"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000619"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "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"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001146"
+                "@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": "nrel00000729"
+                "@value": "nrel00000105"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000528",
+        "@id": "urn:nrel_example/nrel00000136",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27771,593 +27834,517 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000528"
+                "@value": "nrel00000136"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000974",
+        "@id": "urn:nrel_example/nrel00001176",
         "@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/Frequency"
+                "@id": "urn:nrel_example/nrel00000137"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000561"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001095"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000625"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000668"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000810"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001102"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000046"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000623"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000974"
+                "@value": "nrel00001176"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000197",
+        "@id": "urn:nrel_example/nrel00000155",
         "@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/nrel00000862"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "urn:nrel_example/nrel00000464"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000417"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000197"
+                "@value": "nrel00000155"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001065",
+        "@id": "urn:nrel_example/nrel00000643",
         "@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-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001065"
+                "@value": "nrel00000643"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000013",
+        "@id": "urn:nrel_example/nrel00000335",
         "@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/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": "nrel00000013"
+                "@value": "nrel00000335"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000459",
+        "@id": "urn:nrel_example/nrel00000638",
         "@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": "nrel00000459"
+                "@value": "nrel00000638"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000906",
+        "@id": "urn:nrel_example/nrel00000987",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000827"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000852"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000422"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000855"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000906"
+                "@value": "nrel00000987"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000960",
+        "@id": "urn:nrel_example/nrel00000392",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "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/nrel00000747"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001008"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000635"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001023"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000081"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000710"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001138"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000960"
+                "@value": "nrel00000392"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000135",
+        "@id": "urn:nrel_example/nrel00001222",
         "@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#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000202"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000740"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000135"
+                "@value": "nrel00001222"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000589",
+        "@id": "urn:nrel_example/nrel00000628",
         "@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/nrel00000240"
+                "@id": "urn:nrel_example/nrel00000677"
             },
             {
-                "@id": "urn:nrel_example/nrel00000903"
+                "@id": "urn:nrel_example/nrel00001262"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000632"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000716"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000589"
+                "@value": "nrel00000628"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000938",
+        "@id": "urn:nrel_example/nrel00000293",
         "@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#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000742"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000961"
+                "@id": "urn:nrel_example/nrel00001069"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000064"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000332"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000475"
+                "@id": "urn:nrel_example/nrel00000419"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000938"
+                "@value": "nrel00000293"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001077",
+        "@id": "urn:nrel_example/nrel00000478",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000474"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000708"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000134"
+                "@id": "urn:nrel_example/nrel00000345"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001077"
+                "@value": "nrel00000478"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000344",
+        "@id": "urn:nrel_example/nrel00000670",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000944"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001210"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000145"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000170"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000174"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000384"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000456"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000468"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000937"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001081"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001120"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001246"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000344"
+                "@value": "nrel00000670"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000738",
+        "@id": "urn:nrel_example/nrel00001237",
         "@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": "nrel00000738"
+                "@value": "nrel00001237"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000227",
+        "@id": "urn:nrel_example/nrel00000052",
         "@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": "nrel00000227"
+                "@value": "nrel00000052"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000733",
+        "@id": "urn:nrel_example/nrel00000062",
         "@type": [
             "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000949"
+                "@id": "urn:nrel_example/nrel00000514"
             },
             {
-                "@id": "urn:nrel_example/nrel00001057"
+                "@id": "urn:nrel_example/nrel00000913"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000357"
+                "@id": "urn:nrel_example/nrel00000601"
             },
             {
-                "@id": "urn:nrel_example/nrel00001017"
+                "@id": "urn:nrel_example/nrel00000793"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000733"
+                "@value": "nrel00000062"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000295",
+        "@id": "urn:nrel_example/nrel00000500",
         "@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/Energy"
+                "@id": "urn:nrel_example/nrel00001125"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000216"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001168"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000295"
+                "@value": "nrel00000500"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000325",
+        "@id": "urn:nrel_example/nrel00000309",
         "@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/nrel00000000"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001220"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000325"
+                "@value": "nrel00000309"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000500",
+        "@id": "urn:nrel_example/nrel00001295",
         "@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/nrel00001125"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000216"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001168"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000500"
+                "@value": "nrel00001295"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000140",
+        "@id": "urn:nrel_example/nrel00001219",
         "@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/nrel00000462"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000924"
             }
         ],
-        "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": "nrel00000140"
+                "@value": "nrel00001219"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000801",
+        "@id": "urn:nrel_example/nrel00000523",
         "@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": "nrel00000801"
+                "@value": "nrel00000523"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000520",
+        "@id": "urn:nrel_example/nrel00000086",
         "@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/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000520"
+                "@value": "nrel00000086"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001279",
+        "@id": "urn:nrel_example/nrel00000083",
         "@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/nrel00000437"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001104"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00001026"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001252"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001279"
+                "@value": "nrel00000083"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000978",
+        "@id": "urn:nrel_example/nrel00000360",
         "@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": "nrel00000978"
+                "@value": "nrel00000360"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001288",
+        "@id": "urn:nrel_example/nrel00001293",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -28373,38 +28360,65 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001288"
+                "@value": "nrel00001293"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001278",
+        "@id": "urn:nrel_example/nrel00000707",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001260"
+                "@id": "urn:nrel_example/nrel00000735"
             },
             {
-                "@id": "urn:nrel_example/nrel00001311"
+                "@id": "urn:nrel_example/nrel00001172"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@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/nrel00001237"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001278"
+                "@value": "nrel00000707"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000245",
+        "@id": "urn:nrel_example/nrel00001068",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -28413,328 +28427,322 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000245"
+                "@value": "nrel00001068"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000178",
+        "@id": "urn:nrel_example/nrel00000314",
         "@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": "nrel00000178"
+                "@value": "nrel00000314"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000051",
+        "@id": "urn:nrel_example/nrel00000941",
         "@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"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000251"
+            },
             {
-                "@value": "nrel00000051"
+                "@id": "urn:nrel_example/nrel00000846"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000049",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00000165"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000175"
+                "@id": "urn:nrel_example/nrel00000404"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000681"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000049"
+                "@value": "nrel00000941"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000645",
+        "@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/Energy"
+                "@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/KiloW-HR"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000645"
+                "@value": "nrel00000725"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000072",
+        "@id": "urn:nrel_example/nrel00001252",
         "@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": "nrel00000072"
+                "@value": "nrel00001252"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000835",
+        "@id": "urn:nrel_example/nrel00000820",
         "@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": "nrel00000835"
+                "@value": "nrel00000820"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000419",
+        "@id": "urn:nrel_example/nrel00000610",
         "@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": "nrel00000419"
+                "@value": "nrel00000610"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000828",
+        "@id": "urn:nrel_example/nrel00001193",
         "@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/nrel00000251"
+                "@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/nrel00000121"
+                "@value": "nrel00001193"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001260",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000071"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000828"
+                "@value": "nrel00001260"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000565",
+        "@id": "urn:nrel_example/nrel00000881",
         "@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/nrel00000544"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000565"
+                "@value": "nrel00000881"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000173",
+        "@id": "urn:nrel_example/nrel00000327",
         "@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": "nrel00000173"
+                "@value": "nrel00000327"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000972",
+        "@id": "urn:nrel_example/nrel00000393",
         "@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#OutletConnectionPoint"
         ],
-        "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": "nrel00000972"
+                "@value": "nrel00000393"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000934",
+        "@id": "urn:nrel_example/nrel00000858",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000153"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000302"
+                "@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/nrel00000653"
-            },
+                "@value": "nrel00000858"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000164",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001249"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000934"
+                "@value": "nrel00000164"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000594",
+        "@id": "urn:nrel_example/nrel00000242",
         "@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": "nrel00000594"
+                "@value": "nrel00000242"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001052",
+        "@id": "urn:nrel_example/nrel00000306",
         "@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/nrel00000967"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001052"
+                "@value": "nrel00000306"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000136",
+        "@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/ElectricPower"
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00001022"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000136"
+                "@value": "nrel00000230"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000952",
+        "@id": "urn:nrel_example/nrel00000489",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -28745,46 +28753,38 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000952"
+                "@value": "nrel00000489"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000119",
+        "@id": "urn:nrel_example/nrel00000097",
         "@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": "nrel00000119"
+                "@value": "nrel00000097"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001215",
+        "@id": "urn:nrel_example/nrel00000678",
         "@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/nrel00000931"
+            },
             {
-                "@value": "nrel00001215"
+                "@id": "urn:nrel_example/nrel00001256"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000420",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -28793,7 +28793,7 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000420"
+                "@value": "nrel00000678"
             }
         ]
     }
diff --git a/objects.inv b/objects.inv
index 98f6cd18..c75dd179 100644
Binary files a/objects.inv and b/objects.inv differ
diff --git a/search.html b/search.html
index 1cc878f5..1128bad1 100644
--- a/search.html
+++ b/search.html
@@ -170,7 +170,7 @@
 </ul>
 <p aria-level="2" class="caption" role="heading"><span class="caption-text">Example Systems</span></p>
 <ul class="nav bd-sidenav">
-<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only</a></li>
+<li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.1.html">ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only</a></li>
 <li class="toctree-l1"><a class="reference internal" href="examples/guideline36-2021-4.2.html">ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat</a></li>
 </ul>
 
diff --git a/searchindex.js b/searchindex.js
index 1517c4a6..be6f65e6 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/lbnl-example", "intro"], "filenames": ["examples/NREL-example.md", "examples/guideline36-2021-4.1.md", "examples/guideline36-2021-4.2.md", "examples/lbnl-example.md", "intro.md"], "titles": ["NREL Example Building", "ASHRAE Guideline 36-2021 4.1 4.1 VAV Terminal Unit-Cooling Only", "ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat", "LBNL Example Building", "Open223 Models"], "terms": {"thi": [0, 1, 2, 3, 4], "an": [0, 1, 2, 3], "provid": [0, 3, 4], "nation": [0, 3], "renew": 0, "energi": 0, "laboratori": [0, 3], "built": 0, "buildingmotif": 0, "tool": 0, "turtl": [0, 1, 2, 3], "file": [0, 1, 2, 3], "json": [0, 1, 2, 3], "ld": [0, 1, 2, 3], "descript": [0, 3], "url": [0, 3], "zone": [0, 3], "room": [0, 3], "temperatur": [0, 3], "sensor": [0, 1, 2, 3], "link": [0, 3], "parent": [0, 1, 2, 3], "class": [0, 1, 2, 3], "instanc": [0, 1, 2, 3], "equip": [0, 1, 2, 3, 4], "131": 0, "valv": [0, 2, 3], "41": [0, 3], "heatingcoil": [0, 2, 3], "19": 0, "fan": [0, 3], "13": 0, "pump": 0, "12": 0, "coolingcoil": [0, 3], "10": 0, "fancoilunit": 0, "9": 0, "terminalunit": 0, "filter": 0, "4": [0, 4], "damper": [0, 1, 2, 3], "heatexchang": 0, "2": [0, 1, 3, 4], "heatrecoverycoil": 0, "airhandlingunit": [0, 3], "1": [0, 2, 3, 4], "connect": [0, 1, 2, 3, 4], "duct": [0, 1, 2, 3], "57": 0, "connectionpoint": [0, 1, 2, 3], "outletconnectionpoint": [0, 1, 2, 3], "196": 0, "inletconnectionpoint": [0, 1, 2, 3], "187": 0, "domainspac": [0, 3], "15": 0, "3": [0, 2], "properti": [0, 1, 2, 3], "quantifiableobservableproperti": [0, 1, 2, 3], "381": 0, "enumeratedobservableproperti": [0, 3], "119": 0, "enumeratedactuatableproperti": [0, 3], "66": 0, "quantifiableactuatableproperti": [0, 1, 2, 3], "29": 0, "quantifiableproperti": [0, 1, 2, 3], "6": [0, 1, 2, 3], "exampl": [1, 2], "variabl": [1, 2], "air": [1, 2], "volum": [1, 2], "from": [1, 2], "section": [1, 2], "illustr": 1, "figur": 1, "A": 1, "actuat": [1, 2, 3], "singleducttermin": [1, 2, 3], "unit": [2, 4], "pipe": [2, 3], "lawrenc": 3, "berkelei": 3, "167": 3, "85": 3, "43": 3, "42": 3, "40": 3, "126": 3, "88": 3, "304": 3, "47": 3, "38": 3, "299": 3, "249": 3, "200": 3, "ashra": 4, "standard": 4, "223p": 4, "propos": 4, "formal": 4, "defin": 4, "knowledg": 4, "concept": 4, "repres": 4, "inform": 4, "between": 4, "mechan": 4, "space": 4, "within": 4, "measur": 4, "control": 4, "point": 4, "It": 4, "metadata": 4, "schema": 4, "semant": 4, "ontolog": 4, "construct": 4, "rule": 4, "need": 4, "interoper": 4, "machin": 4, "readabl": 4, "softwar": 4, "applic": 4, "abil": 4, "determin": 4, "essenti": 4, "about": 4, "mean": 4, "context": 4, "data": 4, "support": 4, "deploy": 4, "variou": 4, "advanc": 4, "featur": 4, "fault": 4, "detect": 4, "diagnost": 4, "autom": 4, "commiss": 4, "public": 4, "document": 4, "yet": 4, "publicli": 4, "publish": 4, "site": 4, "contain": 4, "other": 4, "asset": 4, "223": 4, "lbnl": 4, "nrel": 4, "guidelin": 4, "36": 4, "2021": 4, "vav": 4, "termin": 4, "cool": 4, "onli": 4, "reheat": 4}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"nrel": 0, "exampl": [0, 3, 4], "build": [0, 3, 4], "download": [0, 1, 2, 3], "queri": [0, 2, 3], "model": [0, 1, 2, 3, 4], "compon": [0, 1, 2, 3], "ashra": [1, 2], "guidelin": [1, 2], "36": [1, 2], "2021": [1, 2], "4": [1, 2], "1": 1, "vav": [1, 2], "termin": [1, 2], "unit": 1, "cool": 1, "onli": 1, "2": 2, "reheat": 2, "lbnl": 3, "open223": 4, "tabl": 4, "content": 4, "system": 4}, "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/lbnl-example", "intro"], "filenames": ["examples/NREL-example.md", "examples/guideline36-2021-4.1.md", "examples/guideline36-2021-4.2.md", "examples/lbnl-example.md", "intro.md"], "titles": ["NREL Example Building", "ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit-Cooling Only", "ASHRAE Guideline 36-2021 4.2 VAV Terminal with Reheat", "LBNL Example Building", "Open223 Models"], "terms": {"thi": [0, 1, 2, 3, 4], "an": [0, 1, 2, 3], "provid": [0, 3, 4], "nation": [0, 3], "renew": 0, "energi": 0, "laboratori": [0, 3], "built": 0, "buildingmotif": 0, "tool": 0, "turtl": [0, 1, 2, 3], "file": [0, 1, 2, 3], "json": [0, 1, 2, 3], "ld": [0, 1, 2, 3], "descript": [0, 3], "url": [0, 3], "zone": [0, 3], "room": [0, 3], "temperatur": [0, 3], "sensor": [0, 1, 2, 3], "link": [0, 3], "parent": [0, 1, 2, 3], "class": [0, 1, 2, 3], "instanc": [0, 1, 2, 3], "equip": [0, 1, 2, 3, 4], "131": 0, "valv": [0, 2, 3], "41": [0, 3], "heatingcoil": [0, 2, 3], "19": 0, "fan": [0, 3], "13": 0, "pump": 0, "12": 0, "coolingcoil": [0, 3], "10": 0, "fancoilunit": 0, "9": 0, "terminalunit": 0, "filter": 0, "4": [0, 4], "damper": [0, 1, 2, 3], "heatexchang": 0, "2": [0, 1, 3, 4], "heatrecoverycoil": 0, "airhandlingunit": [0, 3], "1": [0, 2, 3, 4], "connect": [0, 1, 2, 3, 4], "duct": [0, 1, 2, 3], "57": 0, "connectionpoint": [0, 1, 2, 3], "outletconnectionpoint": [0, 1, 2, 3], "196": 0, "inletconnectionpoint": [0, 1, 2, 3], "187": 0, "domainspac": [0, 3], "15": 0, "3": [0, 2], "properti": [0, 1, 2, 3], "quantifiableobservableproperti": [0, 1, 2, 3], "381": 0, "enumeratedobservableproperti": [0, 3], "119": 0, "enumeratedactuatableproperti": [0, 3], "66": 0, "quantifiableactuatableproperti": [0, 1, 2, 3], "29": 0, "quantifiableproperti": [0, 1, 2, 3], "6": [0, 1, 2, 3], "exampl": [1, 2], "variabl": [1, 2], "air": [1, 2], "volum": [1, 2], "from": [1, 2], "section": [1, 2], "illustr": 1, "figur": 1, "A": 1, "actuat": [1, 2, 3], "singleducttermin": [1, 2, 3], "unit": [2, 4], "pipe": [2, 3], "lawrenc": 3, "berkelei": 3, "167": 3, "85": 3, "43": 3, "42": 3, "40": 3, "126": 3, "88": 3, "304": 3, "47": 3, "38": 3, "299": 3, "249": 3, "200": 3, "ashra": 4, "standard": 4, "223p": 4, "propos": 4, "formal": 4, "defin": 4, "knowledg": 4, "concept": 4, "repres": 4, "inform": 4, "between": 4, "mechan": 4, "space": 4, "within": 4, "measur": 4, "control": 4, "point": 4, "It": 4, "metadata": 4, "schema": 4, "semant": 4, "ontolog": 4, "construct": 4, "rule": 4, "need": 4, "interoper": 4, "machin": 4, "readabl": 4, "softwar": 4, "applic": 4, "abil": 4, "determin": 4, "essenti": 4, "about": 4, "mean": 4, "context": 4, "data": 4, "support": 4, "deploy": 4, "variou": 4, "advanc": 4, "featur": 4, "fault": 4, "detect": 4, "diagnost": 4, "autom": 4, "commiss": 4, "public": 4, "document": 4, "yet": 4, "publicli": 4, "publish": 4, "site": 4, "contain": 4, "other": 4, "asset": 4, "223": 4, "lbnl": 4, "nrel": 4, "guidelin": 4, "36": 4, "2021": 4, "vav": 4, "termin": 4, "cool": 4, "onli": 4, "reheat": 4}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"nrel": 0, "exampl": [0, 3, 4], "build": [0, 3, 4], "download": [0, 1, 2, 3], "queri": [0, 2, 3], "model": [0, 1, 2, 3, 4], "compon": [0, 1, 2, 3], "ashra": [1, 2], "guidelin": [1, 2], "36": [1, 2], "2021": [1, 2], "4": [1, 2], "1": 1, "vav": [1, 2], "termin": [1, 2], "unit": 1, "cool": 1, "onli": 1, "2": 2, "reheat": 2, "lbnl": 3, "open223": 4, "tabl": 4, "content": 4, "system": 4}, "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