diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl
index 91e2ea0..378b110 100644
--- a/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl
+++ b/system_tests/src/test_esdl/output/test__grow_optimizer_no_heat_losses__happy_path.esdl
@@ -1,46 +1,135 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<esdl:EnergySystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:esdl="http://www.tno.nl/esdl" name="PoC Tutorial_SmartControlOptimized_grow_optimizer_no_heat_losses" id="11f0c3c2-9c87-48e3-a79c-7230445e8f25" version="13" esdlVersion="v2207" description="">
-  <energySystemInformation xsi:type="esdl:EnergySystemInformation" id="5fa7e6e3-5701-48a7-bbbd-cad59a46f6c5">
-    <carriers xsi:type="esdl:Carriers" id="42a694c6-9a1b-4cc7-bbae-0b44725f9434">
-      <carrier xsi:type="esdl:HeatCommodity" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" supplyTemperature="80.0" name="Primary"/>
-      <carrier xsi:type="esdl:HeatCommodity" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" returnTemperature="40.0" name="Primary_ret"/>
-    </carriers>
-    <quantityAndUnits xsi:type="esdl:QuantityAndUnits" id="38f7850a-2090-411e-a15a-84b1d7b78362">
-      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT" id="e9405fc8-5e57-4df5-8584-4babee7cdf1b" description="Power in MW" multiplier="MEGA"/>
-    </quantityAndUnits>
-  </energySystemInformation>
-  <instance xsi:type="esdl:Instance" name="Untitled instance" id="9af52a01-24e2-4bbe-a7b8-f868161e6ca3">
+<esdl:EnergySystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:esdl="http://www.tno.nl/esdl" version="13" description="" esdlVersion="v2207" name="PoC Tutorial_SmartControlOptimized_grow_optimizer_no_heat_losses" id="73eb2eb6-8b24-4063-a20e-c1077ceca996">
+  <instance xsi:type="esdl:Instance" id="9af52a01-24e2-4bbe-a7b8-f868161e6ca3" name="Untitled instance">
     <area xsi:type="esdl:Area" name="Untitled area" id="9edf5aa3-3855-4dac-b6f5-01c2edf1a43a">
-      <asset xsi:type="esdl:ResidualHeatSource" id="72d74fb5-134f-4bfb-829e-220ab76a8a7b" power="7822436.328000002" name="ResidualHeatSource_72d7">
-        <geometry xsi:type="esdl:Point" lon="4.372987747192384" lat="52.00467202060717" CRS="WGS84"/>
-        <port xsi:type="esdl:OutPort" id="d890f8aa-9b94-493d-b017-bd7cebaf8c77" connectedTo="07c2f88e-85be-4b8b-a72e-14364a3810c9" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="c8298117-9ba6-48e4-bc21-a30ddfa4c305" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="7e1ba30d-4a83-4f6f-9fec-b70851d316f9" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-          </profile>
-        </port>
-        <port xsi:type="esdl:InPort" connectedTo="c0a27794-98e2-4119-a363-cec4f0b525cd" id="4d6c18cd-cc52-443d-8e53-96cd188dd1a8" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In"/>
+      <KPIs xsi:type="esdl:KPIs" id="1620255f-6b04-4e06-86ed-6eb65c9d4490">
+        <kpi xsi:type="esdl:DistributionKPI" name="High level cost breakdown [EUR] (yearly averaged)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="2593118.247333333" label="CAPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="6820966.574094009" label="OPEX"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="High level cost breakdown [EUR] (30.0 year period)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="77793547.41999999" label="CAPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="204628997.22282025" label="OPEX"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="Overall cost breakdown [EUR] (yearly averaged)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="433333.3333333327" label="Installation"/>
+            <stringItem xsi:type="esdl:StringItem" value="2159784.914" label="Investment"/>
+            <stringItem xsi:type="esdl:StringItem" value="2127504.7772940076" label="Variable OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="4693461.796800001" label="Fixed OPEX"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="Overall cost breakdown [EUR] (30.0 year period)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="12999999.99999998" label="Installation"/>
+            <stringItem xsi:type="esdl:StringItem" value="64793547.42" label="Investment"/>
+            <stringItem xsi:type="esdl:StringItem" value="63825143.31882023" label="Variable OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="140803853.904" label="Fixed OPEX"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="CAPEX breakdown [EUR] (30.0 year period)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="21733654.491999984" label="ResidualHeatSource"/>
+            <stringItem xsi:type="esdl:StringItem" value="8059892.928000001" label="Pipe"/>
+            <stringItem xsi:type="esdl:StringItem" value="48000000.0" label="HeatingDemand"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="OPEX breakdown [EUR] (yearly averaged)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="6820966.574094009" label="ResidualHeatSource"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="OPEX breakdown [EUR] (30.0 year period)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="204628997.22282025" label="ResidualHeatSource"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="Energy production [Wh] (yearly averaged)">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="21275047772.940075" label="ResidualHeatSource_72d7"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" physicalQuantity="ENERGY"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="Area_76a7: Asset cost breakdown [EUR]">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="1000000.0" label="Installation"/>
+            <stringItem xsi:type="esdl:StringItem" value="15000000.0" label="Investment"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="Area_9d0f: Asset cost breakdown [EUR]">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="1000000.0" label="Installation"/>
+            <stringItem xsi:type="esdl:StringItem" value="15000000.0" label="Investment"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+        <kpi xsi:type="esdl:DistributionKPI" name="Area_a58a: Asset cost breakdown [EUR]">
+          <distribution xsi:type="esdl:StringLabelDistribution">
+            <stringItem xsi:type="esdl:StringItem" value="1000000.0" label="Installation"/>
+            <stringItem xsi:type="esdl:StringItem" value="15000000.0" label="Investment"/>
+          </distribution>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
+        </kpi>
+      </KPIs>
+      <asset xsi:type="esdl:ResidualHeatSource" name="ResidualHeatSource_72d7" power="7822436.328000002" id="72d74fb5-134f-4bfb-829e-220ab76a8a7b">
         <costInformation xsi:type="esdl:CostInformation" id="123cc46e-f8ef-42f9-842f-08e77dd06899">
           <fixedOperationalCosts xsi:type="esdl:SingleValue" value="600000.0" id="8ee43904-745d-4f5c-8b15-5a2adcde7e5f">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="4c3a445d-d13f-4f61-8d75-22280135830f" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT"/>
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="4c3a445d-d13f-4f61-8d75-22280135830f"/>
           </fixedOperationalCosts>
           <variableOperationalCosts xsi:type="esdl:SingleValue" value="100.0" id="e5bc1b5e-23b1-4985-94f2-bea25c12da14">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="de56cc5d-2baa-451c-b38c-47abea1393c2" description="Cost in EUR/MWh" perMultiplier="MEGA" perUnit="WATTHOUR"/>
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MWh" perMultiplier="MEGA" perUnit="WATTHOUR" unit="EURO" physicalQuantity="COST" id="de56cc5d-2baa-451c-b38c-47abea1393c2"/>
           </variableOperationalCosts>
           <investmentCosts xsi:type="esdl:SingleValue" value="1500000.0" id="3102215e-50a4-4332-b16e-2fd6522df31b">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="69673880-fe81-4f34-8fd9-558cc693a251" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT"/>
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="69673880-fe81-4f34-8fd9-558cc693a251"/>
           </investmentCosts>
           <marginalCosts xsi:type="esdl:SingleValue" value="1.0" id="e52de449-7340-4878-b582-d20711d9fb14">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" description="Cost in EUR" id="4fccbb6b-2e41-46d9-a92c-f94da7c3aca7"/>
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="4fccbb6b-2e41-46d9-a92c-f94da7c3aca7"/>
           </marginalCosts>
           <installationCosts xsi:type="esdl:SingleValue" value="10000000.0" id="12c24715-08dc-4b61-ae15-76541704c83a">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" description="Cost in EUR" id="89b04c83-eb32-49a3-adc4-492a719221d3"/>
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="89b04c83-eb32-49a3-adc4-492a719221d3"/>
           </installationCosts>
         </costInformation>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="d890f8aa-9b94-493d-b017-bd7cebaf8c77" connectedTo="07c2f88e-85be-4b8b-a72e-14364a3810c9">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="511ee3e1-59e8-48ff-b399-346cdb71c56b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="2cca7753-a435-4ab2-b9ed-069b46ab5e0b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+          </profile>
+        </port>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="c0a27794-98e2-4119-a363-cec4f0b525cd" id="4d6c18cd-cc52-443d-8e53-96cd188dd1a8"/>
+        <geometry xsi:type="esdl:Point" lon="4.372987747192384" CRS="WGS84" lat="52.00467202060717"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe1" outerDiameter="0.25" diameter="DN150" innerDiameter="0.1603" length="818.07" name="Pipe1" related="Pipe1_ret">
+      <asset xsi:type="esdl:Pipe" name="Pipe1" diameter="DN150" innerDiameter="0.1603" length="818.07" id="Pipe1" related="Pipe1_ret" outerDiameter="0.25">
+        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
+          <investmentCosts xsi:type="esdl:SingleValue" value="1126.4" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="d890f8aa-9b94-493d-b017-bd7cebaf8c77" id="07c2f88e-85be-4b8b-a72e-14364a3810c9"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="fc2801d0-215b-4d2b-9846-ee4918b87e21" connectedTo="d149871b-d76a-4cc3-8922-c8d99205f47e">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="e2e84097-feb5-439b-89b1-e070d188aea9">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="1b1f3dad-a4f8-4a39-86dd-afb5ca6b1831">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="d8355c04-1a11-4610-8424-ce038a863049">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
+          </profile>
+        </port>
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.372987747192384" lat="52.00467202060717"/>
           <point xsi:type="esdl:Point" lon="4.365863800048829" lat="52.00210934629504"/>
@@ -57,31 +146,31 @@
             <matter xsi:type="esdl:Material" id="893337e3-58f1-4fb4-8c25-68d71b11fb71" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
-        <port xsi:type="esdl:InPort" connectedTo="d890f8aa-9b94-493d-b017-bd7cebaf8c77" id="07c2f88e-85be-4b8b-a72e-14364a3810c9" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="fc2801d0-215b-4d2b-9846-ee4918b87e21" connectedTo="d149871b-d76a-4cc3-8922-c8d99205f47e" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="cf83f090-16fc-4dbd-8850-8e13934f0f01" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="a309f33e-a71b-4793-8195-24f82f49b88d" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="87bc1c3c-8776-48bd-b1a2-765ebaa43c20" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
-          </profile>
-        </port>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
-          <investmentCosts xsi:type="esdl:SingleValue" name="Combined investment and installation costs" value="1126.4" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="9169bd50-197f-4d6b-aaac-b383a59c815d" description="Costs in EUR/m" perUnit="METRE"/>
-          </investmentCosts>
-        </costInformation>
       </asset>
-      <asset xsi:type="esdl:Joint" id="a04cb927-426d-4016-a084-356002a85d6c" name="Joint_a04c">
+      <asset xsi:type="esdl:Joint" name="Joint_a04c" id="a04cb927-426d-4016-a084-356002a85d6c">
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="fc2801d0-215b-4d2b-9846-ee4918b87e21" id="d149871b-d76a-4cc3-8922-c8d99205f47e"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="3535f436-1270-4b1b-a326-41d69cd6e330" connectedTo="863d2ff2-7a68-4bfb-8aa5-dab741b72b25 7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7"/>
         <geometry xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
-        <port xsi:type="esdl:InPort" connectedTo="fc2801d0-215b-4d2b-9846-ee4918b87e21" id="d149871b-d76a-4cc3-8922-c8d99205f47e" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="3535f436-1270-4b1b-a326-41d69cd6e330" connectedTo="863d2ff2-7a68-4bfb-8aa5-dab741b72b25 7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe2" outerDiameter="0.56" diameter="DN400" innerDiameter="0.3938" length="517.54" name="Pipe2" related="Pipe2_ret">
+      <asset xsi:type="esdl:Pipe" name="Pipe2" diameter="DN400" innerDiameter="0.3938" length="517.54" id="Pipe2" related="Pipe2_ret" outerDiameter="0.56">
+        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
+          <investmentCosts xsi:type="esdl:SingleValue" value="2840.6" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="863d2ff2-7a68-4bfb-8aa5-dab741b72b25"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="8c38fc93-ed85-42ef-9be6-87d47c416e90" connectedTo="4d629e6e-5db4-4a8f-9945-934a24ede11a">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="8148f873-985c-4a8a-8814-d3378f62f55a">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="471c2236-6041-4bd9-b5ee-56a951da749a">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="347e56e7-0a6e-4496-aabf-ecdbc8cbcf8e">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
+          </profile>
+        </port>
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
           <point xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
@@ -97,26 +186,26 @@
             <matter xsi:type="esdl:Material" id="1392ee3f-34f6-4c8e-ab0e-635b9d7ec9be" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
-        <port xsi:type="esdl:InPort" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="863d2ff2-7a68-4bfb-8aa5-dab741b72b25" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="8c38fc93-ed85-42ef-9be6-87d47c416e90" connectedTo="4d629e6e-5db4-4a8f-9945-934a24ede11a" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="a9ca734e-1b60-42f6-bce2-709321b81e82" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="c6574a4a-43a1-43e9-a22a-181920ce6f33" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="6e6f3c4d-82b5-4db8-a010-f38f0850975e" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
-          </profile>
-        </port>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe3" diameter="DN400" innerDiameter="0.3938" length="1182.23" id="Pipe3" related="Pipe3_ret" outerDiameter="0.56">
         <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
-          <investmentCosts xsi:type="esdl:SingleValue" name="Combined investment and installation costs" value="2840.6" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="9169bd50-197f-4d6b-aaac-b383a59c815d" description="Costs in EUR/m" perUnit="METRE"/>
+          <investmentCosts xsi:type="esdl:SingleValue" value="2840.6" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d"/>
           </investmentCosts>
         </costInformation>
-      </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe3" outerDiameter="0.56" diameter="DN400" innerDiameter="0.3938" length="1182.23" name="Pipe3" related="Pipe3_ret">
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="e44060e9-8b0e-41e5-ae46-ce074c891c15"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="13edd58c-4a04-4770-8aac-c6e8689acbba" connectedTo="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="6552976e-55bd-4173-bff5-1eb9f014b2c1">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="668a07ba-0331-4fa0-8e4c-c2509d5bcad8">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="d61bbe8f-3770-4880-a959-327b8e595a16">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
+          </profile>
+        </port>
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
           <point xsi:type="esdl:Point" lon="4.373888969421388" lat="51.989029496545015"/>
@@ -133,31 +222,31 @@
             <matter xsi:type="esdl:Material" id="1392ee3f-34f6-4c8e-ab0e-635b9d7ec9be" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
-        <port xsi:type="esdl:InPort" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="e44060e9-8b0e-41e5-ae46-ce074c891c15" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="13edd58c-4a04-4770-8aac-c6e8689acbba" connectedTo="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="17352eb2-0540-4a88-92fd-6b7acd3cbc5e" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="9d109cea-f2b7-419f-8fe1-b59d5931a1aa" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="01b9a5bd-0857-4e0f-baaa-5a926b551a71" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
-          </profile>
-        </port>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
-          <investmentCosts xsi:type="esdl:SingleValue" name="Combined investment and installation costs" value="2840.6" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="9169bd50-197f-4d6b-aaac-b383a59c815d" description="Costs in EUR/m" perUnit="METRE"/>
-          </investmentCosts>
-        </costInformation>
       </asset>
-      <asset xsi:type="esdl:Joint" id="95caf7c7-e89f-4378-96f2-f904f9255c83" name="Joint_95ca">
+      <asset xsi:type="esdl:Joint" name="Joint_95ca" id="95caf7c7-e89f-4378-96f2-f904f9255c83">
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="8c38fc93-ed85-42ef-9be6-87d47c416e90" id="4d629e6e-5db4-4a8f-9945-934a24ede11a"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="a42acf83-361d-4d4d-8001-8617daad939a" connectedTo="e44060e9-8b0e-41e5-ae46-ce074c891c15 20165ec3-cf86-41e4-976f-079ba0ca5be4"/>
         <geometry xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
-        <port xsi:type="esdl:InPort" connectedTo="8c38fc93-ed85-42ef-9be6-87d47c416e90" id="4d629e6e-5db4-4a8f-9945-934a24ede11a" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="a42acf83-361d-4d4d-8001-8617daad939a" connectedTo="e44060e9-8b0e-41e5-ae46-ce074c891c15 20165ec3-cf86-41e4-976f-079ba0ca5be4" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe4" outerDiameter="0.45" diameter="DN300" innerDiameter="0.3127" length="455.4" name="Pipe4" related="Pipe4_ret">
+      <asset xsi:type="esdl:Pipe" name="Pipe4" diameter="DN300" innerDiameter="0.3127" length="455.4" id="Pipe4" related="Pipe4_ret" outerDiameter="0.45">
+        <costInformation xsi:type="esdl:CostInformation" id="384df56d-e3f0-4794-a0e2-bc0c71482e45">
+          <investmentCosts xsi:type="esdl:SingleValue" value="1962.1" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="983f0959-8566-43ce-a380-782d29406ed3"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="5169316d-ae93-4f04-9a34-7c776444b651" connectedTo="2c5a109b-0d98-47b6-acc1-05e1708f8b85">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="976d36cd-0873-4f81-991f-7b224da3614b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="7277af32-34d8-4fef-b046-ac4e7f36218c">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="07e068cd-3d68-41c0-b8fa-230f674aecb4">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
+          </profile>
+        </port>
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
           <point xsi:type="esdl:Point" lon="4.373545646667481" lat="52.00105253065436"/>
@@ -173,26 +262,26 @@
             <matter xsi:type="esdl:Material" id="9a97f588-10fe-4a34-b0f2-277862151763" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
-        <port xsi:type="esdl:InPort" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="5169316d-ae93-4f04-9a34-7c776444b651" connectedTo="2c5a109b-0d98-47b6-acc1-05e1708f8b85" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="1f1975ca-32ac-4bbe-ac32-ec3454271823" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe5" diameter="DN300" innerDiameter="0.3127" length="252.3" id="Pipe5" related="Pipe5_ret" outerDiameter="0.45">
+        <costInformation xsi:type="esdl:CostInformation" id="4c8d9c8f-7e99-4402-8f66-d413e73db121">
+          <investmentCosts xsi:type="esdl:SingleValue" value="1962.1" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="983f0959-8566-43ce-a380-782d29406ed3"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="20165ec3-cf86-41e4-976f-079ba0ca5be4"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="787c6ae3-96da-41e1-af86-6e68a1e28cb1" connectedTo="01caa60f-1549-4f3f-817e-e4e6807b2398">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="1249f150-980b-4677-bb5b-0ab5c6b15e66">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="5aaab1ef-6597-4cb3-8666-901b6e0cf8c6" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="a4d8b6c9-e120-4af0-927f-bf421c24b2ea">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="a3af545e-fd24-434d-aa4e-2358e3f8e360" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="5bbe9491-7839-4581-b513-475dc8978420">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <costInformation xsi:type="esdl:CostInformation" id="384df56d-e3f0-4794-a0e2-bc0c71482e45">
-          <investmentCosts xsi:type="esdl:SingleValue" name="Combined investment and installation costs" value="1962.1" id="1e93bdda-8a74-42d5-960d-d64e4dff2025">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="983f0959-8566-43ce-a380-782d29406ed3" description="Costs in EUR/m" perUnit="METRE"/>
-          </investmentCosts>
-        </costInformation>
-      </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe5" outerDiameter="0.45" diameter="DN300" innerDiameter="0.3127" length="252.3" name="Pipe5" related="Pipe5_ret">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
           <point xsi:type="esdl:Point" lon="4.373245239257813" lat="51.99648151568376"/>
@@ -208,53 +297,36 @@
             <matter xsi:type="esdl:Material" id="9a97f588-10fe-4a34-b0f2-277862151763" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
-        <port xsi:type="esdl:InPort" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="20165ec3-cf86-41e4-976f-079ba0ca5be4" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In"/>
-        <port xsi:type="esdl:OutPort" id="787c6ae3-96da-41e1-af86-6e68a1e28cb1" connectedTo="01caa60f-1549-4f3f-817e-e4e6807b2398" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="7983ff7a-8ab9-4e9a-8cb1-4add6a880384" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="972a8140-1e80-4cb9-89ef-1d718b8cbd1e" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="9d917b59-5b85-424e-83bd-9e5c8bf508f1" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
-          </profile>
-        </port>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <costInformation xsi:type="esdl:CostInformation" id="4c8d9c8f-7e99-4402-8f66-d413e73db121">
-          <investmentCosts xsi:type="esdl:SingleValue" name="Combined investment and installation costs" value="1962.1" id="1e93bdda-8a74-42d5-960d-d64e4dff2025">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="983f0959-8566-43ce-a380-782d29406ed3" description="Costs in EUR/m" perUnit="METRE"/>
-          </investmentCosts>
-        </costInformation>
       </asset>
-      <asset xsi:type="esdl:Joint" id="076ba789-3040-4952-9b2b-fbf9ed05e6bd" name="Joint_a04c_ret">
-        <geometry xsi:type="esdl:Point" lon="4.3663488762941665" lat="52.000059268817886" CRS="WGS84"/>
-        <port xsi:type="esdl:InPort" connectedTo="c5df4e61-6603-4315-a45a-196903690d9e 23d8b6bb-9480-4f02-ba7c-d00de8ff206e" id="1ba08c64-4c54-4f23-93bf-2b2f6c04229d" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port"/>
-        <port xsi:type="esdl:OutPort" id="044ef084-2a9e-4356-bac2-207f5361d4ce" connectedTo="2c3c73cb-d282-4c97-a060-922c91c50180" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port"/>
+      <asset xsi:type="esdl:Joint" name="Joint_a04c_ret" id="076ba789-3040-4952-9b2b-fbf9ed05e6bd">
+        <port xsi:type="esdl:InPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="c5df4e61-6603-4315-a45a-196903690d9e 23d8b6bb-9480-4f02-ba7c-d00de8ff206e" id="1ba08c64-4c54-4f23-93bf-2b2f6c04229d"/>
+        <port xsi:type="esdl:OutPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="044ef084-2a9e-4356-bac2-207f5361d4ce" connectedTo="2c3c73cb-d282-4c97-a060-922c91c50180"/>
+        <geometry xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
       </asset>
-      <asset xsi:type="esdl:Joint" id="b4a5be45-3352-4837-94d6-b110aa842da6" name="Joint_95ca_ret">
-        <geometry xsi:type="esdl:Point" lon="4.369031429215318" lat="51.99571274701101" CRS="WGS84"/>
-        <port xsi:type="esdl:InPort" connectedTo="59b53a77-a253-4a96-81ef-84e719a1f518 6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" id="6b4d9bba-484b-46aa-bfe6-895d491b6747" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port"/>
-        <port xsi:type="esdl:OutPort" id="5a47482f-6cdf-41b3-91b0-014578ee8143" connectedTo="da70a1aa-53c4-496e-ba63-2c04674b8c84" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port"/>
+      <asset xsi:type="esdl:Joint" name="Joint_95ca_ret" id="b4a5be45-3352-4837-94d6-b110aa842da6">
+        <port xsi:type="esdl:InPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="59b53a77-a253-4a96-81ef-84e719a1f518 6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" id="6b4d9bba-484b-46aa-bfe6-895d491b6747"/>
+        <port xsi:type="esdl:OutPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="5a47482f-6cdf-41b3-91b0-014578ee8143" connectedTo="da70a1aa-53c4-496e-ba63-2c04674b8c84"/>
+        <geometry xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe1_ret" outerDiameter="0.25" diameter="DN150" innerDiameter="0.1603" length="818.07" name="Pipe1_ret" related="Pipe1">
-        <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lon="4.3663488762941665" lat="52.000059268817886" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.365092860885141" lat="52.00219934638504" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.372228431895539" lat="52.004762020697164" CRS="WGS84"/>
-        </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="044ef084-2a9e-4356-bac2-207f5361d4ce" id="2c3c73cb-d282-4c97-a060-922c91c50180" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="c0a27794-98e2-4119-a363-cec4f0b525cd" connectedTo="4d6c18cd-cc52-443d-8e53-96cd188dd1a8" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="8a74b26a-3c82-486f-930b-66dbebe97828" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
+      <asset xsi:type="esdl:Pipe" name="Pipe1_ret" diameter="DN150" innerDiameter="0.1603" length="818.07" id="Pipe1_ret" related="Pipe1" outerDiameter="0.25">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="044ef084-2a9e-4356-bac2-207f5361d4ce" id="2c3c73cb-d282-4c97-a060-922c91c50180"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="c0a27794-98e2-4119-a363-cec4f0b525cd" connectedTo="4d6c18cd-cc52-443d-8e53-96cd188dd1a8">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="e19f9991-6c2b-47be-9db0-bf096a81031b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="c2ad7bee-c37a-4dc7-87e9-b8ac2102360e" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="892f6dae-68aa-420d-bb8d-b484d36498de">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="08d3456c-9c36-4291-a667-c32191310377" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="f75b0fd2-5f91-4d11-b8b1-86768d8f2028">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
+          <point xsi:type="esdl:Point" lon="4.365092860885141" CRS="WGS84" lat="52.00219934638504"/>
+          <point xsi:type="esdl:Point" lon="4.372228431895539" CRS="WGS84" lat="52.004762020697164"/>
+        </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.004">
             <matter xsi:type="esdl:Material" id="fa85538e-ebfa-4bce-8386-04980e793e18" thermalConductivity="52.15" name="steel"/>
@@ -267,103 +339,126 @@
           </component>
         </material>
       </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe2_ret" outerDiameter="0.56" diameter="DN400" innerDiameter="0.3938" length="517.54" name="Pipe2_ret" related="Pipe2">
-        <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lon="4.369031429215318" lat="51.99571274701101" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.3663488762941665" lat="52.000059268817886" CRS="WGS84"/>
-        </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="5a47482f-6cdf-41b3-91b0-014578ee8143" id="da70a1aa-53c4-496e-ba63-2c04674b8c84" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="c5df4e61-6603-4315-a45a-196903690d9e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="805d7367-a2f1-4b8e-abdc-3c509a92a82f" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
+      <asset xsi:type="esdl:Pipe" name="Pipe2_ret" diameter="DN400" innerDiameter="0.3938" length="517.54" id="Pipe2_ret" related="Pipe2" outerDiameter="0.56">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="5a47482f-6cdf-41b3-91b0-014578ee8143" id="da70a1aa-53c4-496e-ba63-2c04674b8c84"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="c5df4e61-6603-4315-a45a-196903690d9e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="6ec3fb02-5859-48c8-a444-dad9dc73508c">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="fffd15ac-ab8e-4c7a-979f-56f68991edc8" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="bdffccbc-5f59-4bab-9d98-3f39967a0cea">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="8223caf0-1a13-4984-bdf5-bd62b306edfc" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="f7459e35-5a4f-463a-abd0-15cb0708bae5">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe3_ret" outerDiameter="0.56" diameter="DN400" innerDiameter="0.3938" length="1182.23" name="Pipe3_ret" related="Pipe3">
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lon="4.378211386257638" lat="51.990784417008705" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.37305259776345" lat="51.98911949663501" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.369031429215318" lat="51.99571274701101" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
+          <point xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" id="6d1edc18-1962-4d3d-9882-ef27ae1702e8" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="59b53a77-a253-4a96-81ef-84e719a1f518" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="b94bcb79-ba7b-42bc-bf52-0b08c6b02f59" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe3_ret" diameter="DN400" innerDiameter="0.3938" length="1182.23" id="Pipe3_ret" related="Pipe3" outerDiameter="0.56">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" id="6d1edc18-1962-4d3d-9882-ef27ae1702e8"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="59b53a77-a253-4a96-81ef-84e719a1f518" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="0d46c989-9846-4a18-8ba4-90c01675e79f">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="75e0777d-b561-4f3e-ada4-13cba6e72335" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="0a41fb7b-1688-4035-860b-6e350059e51c">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="2fa8c64e-a6cc-4948-914b-589378ed6bbc" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="5aaf5764-64ab-42c2-929e-4c2a85fb1311">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe4_ret" outerDiameter="0.45" diameter="DN300" innerDiameter="0.3127" length="455.4" name="Pipe4_ret" related="Pipe4">
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lon="4.372769808163894" lat="52.00114253074436" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.3663488762941665" lat="52.000059268817886" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.378211386257638" CRS="WGS84" lat="51.990784417008705"/>
+          <point xsi:type="esdl:Point" lon="4.37305259776345" CRS="WGS84" lat="51.98911949663501"/>
+          <point xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="d7eb3623-7481-41bb-911d-2dd9bd67db39" id="5e2f4591-43f2-489f-8eb2-63105dbd0355" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="23d8b6bb-9480-4f02-ba7c-d00de8ff206e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="306b8b86-2a35-4137-8573-ab5150a6463e" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe4_ret" diameter="DN300" innerDiameter="0.3127" length="455.4" id="Pipe4_ret" related="Pipe4" outerDiameter="0.45">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="d7eb3623-7481-41bb-911d-2dd9bd67db39" id="5e2f4591-43f2-489f-8eb2-63105dbd0355"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="23d8b6bb-9480-4f02-ba7c-d00de8ff206e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="a570551d-fe62-43f2-9f9e-b3330db32462">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="fc7b7d0a-5a38-4962-9df5-d8a82f87413d" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="17416503-1407-43eb-bf45-f116950ca8a4">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="5da1e5c3-3b5c-4b23-8493-4f5b117901d3" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="a9457e3c-397c-4a31-a968-708cb42c6b2b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" id="Pipe5_ret" outerDiameter="0.45" diameter="DN300" innerDiameter="0.3127" length="252.3" name="Pipe5_ret" related="Pipe5">
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lon="4.372447461880088" lat="51.99657151577376" CRS="WGS84"/>
-          <point xsi:type="esdl:Point" lon="4.369031429215318" lat="51.99571274701101" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.372769808163894" CRS="WGS84" lat="52.00114253074436"/>
+          <point xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" id="35ddd90a-e45c-4afd-95b4-80ce6c927071" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret">
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="9a8b435f-42f5-4e80-a73d-db5c634e6974" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="HeatIn.Q">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe5_ret" diameter="DN300" innerDiameter="0.3127" length="252.3" id="Pipe5_ret" related="Pipe5" outerDiameter="0.45">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" id="35ddd90a-e45c-4afd-95b4-80ce6c927071"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747">
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="d2f9f0bc-0a47-4ebc-8ed0-a791d5e9a365">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="f3e14f6b-75bf-46cf-85dd-08fa1e2a152c" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="Heat_flow">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="ea82f6f4-24e9-4e62-8766-6b74a29df2d6">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="9405a70d-0ba7-4b0f-8e30-7f5877e1c284" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="PostProc.Velocity">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="SPEED" unit="METRE" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="88ac9fbe-0e05-42f2-abaa-8ebb5df06a75">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.372447461880088" CRS="WGS84" lat="51.99657151577376"/>
+          <point xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
+        </geometry>
       </asset>
       <area xsi:type="esdl:Area" name="Area_76a7" id="76a75122-8ea6-472d-8059-374830275d72">
-        <asset xsi:type="esdl:HeatingDemand" id="b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c" power="15000000.0" name="HeatingDemand_b0ff">
-          <geometry xsi:type="esdl:Point" lon="4.373545646667481" lat="52.00105253065436" CRS="WGS84"/>
-          <port xsi:type="esdl:InPort" connectedTo="5169316d-ae93-4f04-9a34-7c776444b651" id="2c5a109b-0d98-47b6-acc1-05e1708f8b85" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In">
-            <profile xsi:type="esdl:InfluxDBProfile" database="energy_profiles" startDate="2018-12-31T23:00:00.000000+0000" host="profiles.warmingup.info" id="b8150ac7-ea23-4be6-b5a3-b6974b8df58d" measurement="WarmingUp default profiles" multiplier="2.0" endDate="2019-12-31T22:00:00.000000+0000" filters="" port="443" field="demand4_MW">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
-            </profile>
-          </port>
-          <port xsi:type="esdl:OutPort" id="d7eb3623-7481-41bb-911d-2dd9bd67db39" connectedTo="5e2f4591-43f2-489f-8eb2-63105dbd0355" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out">
-            <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="b236634e-2fce-4354-8380-55bef2f7c707" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" port="8096" field="HeatIn.Q">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-            </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="1081376b-0c8a-447d-b20b-cd5a066812a0" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" port="8096" field="Heat_flow">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-            </profile>
-          </port>
+        <KPIs xsi:type="esdl:KPIs" id="4ffb9301-2004-4405-8cd6-b1981fcf3d10">
+          <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
+          </kpi>
+          <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
+          </kpi>
+          <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
+          </kpi>
+          <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
+          </kpi>
+          <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
+          </kpi>
+          <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from regional source(s) [%]">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
+          </kpi>
+          <kpi xsi:type="esdl:DoubleKPI" value="7.4" name="Total energy consumed [GWh]">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" multiplier="GIGA" physicalQuantity="ENERGY"/>
+          </kpi>
+        </KPIs>
+        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_b0ff" power="15000000.0" id="b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c">
           <costInformation xsi:type="esdl:CostInformation" id="cd676c1c-6224-406f-a864-3e7ff55265e0">
             <investmentCosts xsi:type="esdl:SingleValue" value="1000000.0" id="08f06cd1-471b-404a-8894-27b315775b59">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="f8e5bc00-6eae-47d6-b7ad-b9699879b14c" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT"/>
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="f8e5bc00-6eae-47d6-b7ad-b9699879b14c"/>
             </investmentCosts>
             <installationCosts xsi:type="esdl:SingleValue" value="1000000.0" id="829c1c62-4266-4560-ac77-b961b7a722cf">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" description="Cost in EUR" id="1c0a9d42-bb5a-44c1-9ed6-824d7c82e932"/>
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="1c0a9d42-bb5a-44c1-9ed6-824d7c82e932"/>
             </installationCosts>
           </costInformation>
+          <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="5169316d-ae93-4f04-9a34-7c776444b651" id="2c5a109b-0d98-47b6-acc1-05e1708f8b85">
+            <profile xsi:type="esdl:InfluxDBProfile" multiplier="2.0" database="energy_profiles" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" measurement="WarmingUp default profiles" filters="" startDate="2018-12-31T23:00:00.000000+0000" port="443" field="demand4_MW" id="b8150ac7-ea23-4be6-b5a3-b6974b8df58d">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
+            </profile>
+          </port>
+          <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="d7eb3623-7481-41bb-911d-2dd9bd67db39" connectedTo="5e2f4591-43f2-489f-8eb2-63105dbd0355">
+            <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="6538826a-738f-44a3-a501-f6ceabff2ca4">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+            </profile>
+            <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="3085ceae-2e2e-4a35-983b-278279e2c4c7">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+            </profile>
+          </port>
+          <geometry xsi:type="esdl:Point" lon="4.373545646667481" CRS="WGS84" lat="52.00105253065436"/>
         </asset>
         <geometry xsi:type="esdl:Polygon" CRS="WGS84">
           <exterior xsi:type="esdl:SubPolygon">
@@ -377,18 +472,20 @@
             <point xsi:type="esdl:Point" lon="4.380712509155274" lat="51.9963626102222"/>
           </exterior>
         </geometry>
-        <KPIs xsi:type="esdl:KPIs" id="4543d765-de04-4566-abaa-31bde4996bc1">
+      </area>
+      <area xsi:type="esdl:Area" name="Area_9d0f" id="9d0fd9ed-662c-42ec-a417-7e789737084c">
+        <KPIs xsi:type="esdl:KPIs" id="6693c814-ab67-461e-b93a-03f8df0ea559">
           <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
@@ -397,34 +494,32 @@
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="7.4" name="Total energy consumed [GWh]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="ENERGY" unit="WATTHOUR" multiplier="GIGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" multiplier="GIGA" physicalQuantity="ENERGY"/>
           </kpi>
         </KPIs>
-      </area>
-      <area xsi:type="esdl:Area" name="Area_9d0f" id="9d0fd9ed-662c-42ec-a417-7e789737084c">
-        <asset xsi:type="esdl:HeatingDemand" id="08fd3385-681a-4211-a083-51775cc99daa" power="15000000.0" name="HeatingDemand_08fd">
-          <geometry xsi:type="esdl:Point" lon="4.373245239257813" lat="51.99648151568376" CRS="WGS84"/>
-          <port xsi:type="esdl:InPort" connectedTo="787c6ae3-96da-41e1-af86-6e68a1e28cb1" id="01caa60f-1549-4f3f-817e-e4e6807b2398" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In">
-            <profile xsi:type="esdl:InfluxDBProfile" database="energy_profiles" startDate="2018-12-31T23:00:00.000000+0000" host="profiles.warmingup.info" id="ddd73fb0-d96f-4127-8d39-869455c77930" measurement="WarmingUp default profiles" multiplier="2.0" endDate="2019-12-31T22:00:00.000000+0000" filters="" port="443" field="demand4_MW">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
-            </profile>
-          </port>
-          <port xsi:type="esdl:OutPort" id="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" connectedTo="35ddd90a-e45c-4afd-95b4-80ce6c927071" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out">
-            <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="14c4ff18-c21c-46b3-915f-3ad758bcd8b9" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" port="8096" field="HeatIn.Q">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-            </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="6b95559d-c68d-4ead-878e-e831766c494f" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" port="8096" field="Heat_flow">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-            </profile>
-          </port>
+        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_08fd" power="15000000.0" id="08fd3385-681a-4211-a083-51775cc99daa">
           <costInformation xsi:type="esdl:CostInformation" id="7eac6b5e-ba11-4ef1-b90e-599dd2690d20">
             <investmentCosts xsi:type="esdl:SingleValue" value="1000000.0" id="26aba0b6-a1a0-4610-97b3-be763548c669">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="424508c6-24aa-4a35-81e9-7ae198cbaeb8" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT"/>
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="424508c6-24aa-4a35-81e9-7ae198cbaeb8"/>
             </investmentCosts>
             <installationCosts xsi:type="esdl:SingleValue" value="1000000.0" id="3b93383a-2ec4-4b35-9335-ebd91f0de600">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" description="Cost in EUR" id="318840e0-6f48-46f4-b9c9-91315d7b45fd"/>
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="318840e0-6f48-46f4-b9c9-91315d7b45fd"/>
             </installationCosts>
           </costInformation>
+          <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="787c6ae3-96da-41e1-af86-6e68a1e28cb1" id="01caa60f-1549-4f3f-817e-e4e6807b2398">
+            <profile xsi:type="esdl:InfluxDBProfile" multiplier="2.0" database="energy_profiles" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" measurement="WarmingUp default profiles" filters="" startDate="2018-12-31T23:00:00.000000+0000" port="443" field="demand4_MW" id="ddd73fb0-d96f-4127-8d39-869455c77930">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
+            </profile>
+          </port>
+          <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" connectedTo="35ddd90a-e45c-4afd-95b4-80ce6c927071">
+            <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="e924b663-f6b2-4d0b-8cd5-88b0542add98">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+            </profile>
+            <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="98732d66-ba09-4af2-9202-f42c202719e9">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+            </profile>
+          </port>
+          <geometry xsi:type="esdl:Point" lon="4.373245239257813" CRS="WGS84" lat="51.99648151568376"/>
         </asset>
         <geometry xsi:type="esdl:Polygon" CRS="WGS84">
           <exterior xsi:type="esdl:SubPolygon">
@@ -436,18 +531,20 @@
             <point xsi:type="esdl:Point" lon="4.372708797454835" lat="51.99272923553559"/>
           </exterior>
         </geometry>
-        <KPIs xsi:type="esdl:KPIs" id="d3ceec7c-a590-46a0-9281-27095311d895">
+      </area>
+      <area xsi:type="esdl:Area" name="Area_a58a" id="a58a988c-95c1-492b-bc63-b125d25f5108">
+        <KPIs xsi:type="esdl:KPIs" id="32d70ba6-72d6-491b-af06-d3312845a541">
           <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
@@ -455,35 +552,33 @@
           <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from regional source(s) [%]">
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
           </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" value="7.4" name="Total energy consumed [GWh]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="ENERGY" unit="WATTHOUR" multiplier="GIGA"/>
+          <kpi xsi:type="esdl:DoubleKPI" value="6.6" name="Total energy consumed [GWh]">
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" multiplier="GIGA" physicalQuantity="ENERGY"/>
           </kpi>
         </KPIs>
-      </area>
-      <area xsi:type="esdl:Area" name="Area_a58a" id="a58a988c-95c1-492b-bc63-b125d25f5108">
-        <asset xsi:type="esdl:HeatingDemand" id="8fbe3d4e-5d5b-4489-9271-9969c2b9e589" power="15000000.0" name="HeatingDemand_8fbe">
-          <geometry xsi:type="esdl:Point" lon="4.379038810729981" lat="51.99069441691871" CRS="WGS84"/>
-          <port xsi:type="esdl:InPort" connectedTo="13edd58c-4a04-4770-8aac-c6e8689acbba" id="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In">
-            <profile xsi:type="esdl:InfluxDBProfile" database="energy_profiles" startDate="2018-12-31T23:00:00.000000+0000" host="profiles.warmingup.info" id="5ae97047-619a-4119-84f3-848b36743e5d" measurement="WarmingUp default profiles" multiplier="2.0" endDate="2019-12-31T22:00:00.000000+0000" filters="" port="443" field="demand3_MW">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
-            </profile>
-          </port>
-          <port xsi:type="esdl:OutPort" id="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" connectedTo="6d1edc18-1962-4d3d-9882-ef27ae1702e8" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out">
-            <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="c78a35d5-381c-4297-a054-502b431955f0" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" port="8096" field="HeatIn.Q">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="FLOW" unit="CUBIC_METRE" perTimeUnit="SECOND"/>
-            </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" database="11f0c3c2-9c87-48e3-a79c-7230445e8f25" startDate="2018-12-31T23:00:00.000000+0000" host="omotes_influxdb" id="be3f2eeb-8739-4b13-80b7-349bd8a38fc7" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" port="8096" field="Heat_flow">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="POWER" unit="WATT"/>
-            </profile>
-          </port>
+        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_8fbe" power="15000000.0" id="8fbe3d4e-5d5b-4489-9271-9969c2b9e589">
           <costInformation xsi:type="esdl:CostInformation" id="32e59a3e-fe5e-4201-bbd6-4f26dc4c961e">
             <investmentCosts xsi:type="esdl:SingleValue" value="1000000.0" id="3971c64d-50e4-47ec-a769-1f91935065d9">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" id="5a0e43e1-b141-4626-87eb-487cdb70e60e" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT"/>
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="5a0e43e1-b141-4626-87eb-487cdb70e60e"/>
             </investmentCosts>
             <installationCosts xsi:type="esdl:SingleValue" value="1000000.0" id="850701a9-ec9a-40c5-ab3e-e0dbe6165cb6">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" description="Cost in EUR" id="b18cdc99-6303-404c-958a-1a4c079f842d"/>
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="b18cdc99-6303-404c-958a-1a4c079f842d"/>
             </installationCosts>
           </costInformation>
+          <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="13edd58c-4a04-4770-8aac-c6e8689acbba" id="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c">
+            <profile xsi:type="esdl:InfluxDBProfile" multiplier="2.0" database="energy_profiles" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" measurement="WarmingUp default profiles" filters="" startDate="2018-12-31T23:00:00.000000+0000" port="443" field="demand3_MW" id="5ae97047-619a-4119-84f3-848b36743e5d">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
+            </profile>
+          </port>
+          <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" connectedTo="6d1edc18-1962-4d3d-9882-ef27ae1702e8">
+            <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="86b31254-defb-455e-9f5e-6fd3793f24fa">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+            </profile>
+            <profile xsi:type="esdl:InfluxDBProfile" database="73eb2eb6-8b24-4063-a20e-c1077ceca996" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="0949d791-947a-4fc1-90e3-c40e32286836">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+            </profile>
+          </port>
+          <geometry xsi:type="esdl:Point" lon="4.379038810729981" CRS="WGS84" lat="51.99069441691871"/>
         </asset>
         <geometry xsi:type="esdl:Polygon" CRS="WGS84">
           <exterior xsi:type="esdl:SubPolygon">
@@ -493,111 +588,16 @@
             <point xsi:type="esdl:Point" lon="4.37633514404297" lat="51.98688879367896"/>
           </exterior>
         </geometry>
-        <KPIs xsi:type="esdl:KPIs" id="9a88ed40-baac-48ff-9883-f6d73f1badd1">
-          <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
-          </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
-          </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
-          </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO" multiplier="MEGA"/>
-          </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
-          </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from regional source(s) [%]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
-          </kpi>
-          <kpi xsi:type="esdl:DoubleKPI" value="6.6" name="Total energy consumed [GWh]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="ENERGY" unit="WATTHOUR" multiplier="GIGA"/>
-          </kpi>
-        </KPIs>
       </area>
-      <KPIs xsi:type="esdl:KPIs" id="1d394928-045f-4801-ae6c-7464959493de">
-        <kpi xsi:type="esdl:DistributionKPI" name="High level cost breakdown [EUR] (yearly averaged)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="CAPEX" value="2593118.247333333"/>
-            <stringItem xsi:type="esdl:StringItem" label="OPEX" value="6820966.574094008"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="High level cost breakdown [EUR] (30.0 year period)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="CAPEX" value="77793547.41999999"/>
-            <stringItem xsi:type="esdl:StringItem" label="OPEX" value="204628997.22282022"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="Overall cost breakdown [EUR] (yearly averaged)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="Installation" value="433333.33333333273"/>
-            <stringItem xsi:type="esdl:StringItem" label="Investment" value="2159784.914"/>
-            <stringItem xsi:type="esdl:StringItem" label="Variable OPEX" value="2127504.777294007"/>
-            <stringItem xsi:type="esdl:StringItem" label="Fixed OPEX" value="4693461.796800001"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="Overall cost breakdown [EUR] (30.0 year period)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="Installation" value="12999999.999999981"/>
-            <stringItem xsi:type="esdl:StringItem" label="Investment" value="64793547.42"/>
-            <stringItem xsi:type="esdl:StringItem" label="Variable OPEX" value="63825143.318820216"/>
-            <stringItem xsi:type="esdl:StringItem" label="Fixed OPEX" value="140803853.904"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="CAPEX breakdown [EUR] (30.0 year period)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="ResidualHeatSource" value="21733654.491999984"/>
-            <stringItem xsi:type="esdl:StringItem" label="Pipe" value="8059892.928"/>
-            <stringItem xsi:type="esdl:StringItem" label="HeatingDemand" value="48000000.0"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="OPEX breakdown [EUR] (yearly averaged)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="ResidualHeatSource" value="6820966.574094008"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="OPEX breakdown [EUR] (30.0 year period)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="ResidualHeatSource" value="204628997.22282022"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="Energy production [Wh] (yearly averaged)">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="ENERGY" unit="WATTHOUR"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="ResidualHeatSource_72d7" value="21275047772.940075"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="Area_76a7: Asset cost breakdown [EUR]">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="Installation" value="1000000.0"/>
-            <stringItem xsi:type="esdl:StringItem" label="Investment" value="15000000.0"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="Area_9d0f: Asset cost breakdown [EUR]">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="Installation" value="1000000.0"/>
-            <stringItem xsi:type="esdl:StringItem" label="Investment" value="15000000.0"/>
-          </distribution>
-        </kpi>
-        <kpi xsi:type="esdl:DistributionKPI" name="Area_a58a: Asset cost breakdown [EUR]">
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
-          <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" label="Installation" value="1000000.0"/>
-            <stringItem xsi:type="esdl:StringItem" label="Investment" value="15000000.0"/>
-          </distribution>
-        </kpi>
-      </KPIs>
     </area>
   </instance>
+  <energySystemInformation xsi:type="esdl:EnergySystemInformation" id="5fa7e6e3-5701-48a7-bbbd-cad59a46f6c5">
+    <carriers xsi:type="esdl:Carriers" id="42a694c6-9a1b-4cc7-bbae-0b44725f9434">
+      <carrier xsi:type="esdl:HeatCommodity" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Primary" supplyTemperature="80.0"/>
+      <carrier xsi:type="esdl:HeatCommodity" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Primary_ret" returnTemperature="40.0"/>
+    </carriers>
+    <quantityAndUnits xsi:type="esdl:QuantityAndUnits" id="38f7850a-2090-411e-a15a-84b1d7b78362">
+      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Power in MW" multiplier="MEGA" unit="WATT" physicalQuantity="POWER" id="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
+    </quantityAndUnits>
+  </energySystemInformation>
 </esdl:EnergySystem>
diff --git a/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl b/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl
index 00f0bb5..ae78199 100644
--- a/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl
+++ b/system_tests/src/test_esdl/output/test__grow_optimizer_with_pressure__happy_path.esdl
@@ -1,466 +1,466 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<esdl:EnergySystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:esdl="http://www.tno.nl/esdl" version="13" description="" esdlVersion="v2207" name="PoC Tutorial_SmartControlOptimized_grow_optimizer_with_pressure" id="b3020a9c-3f81-4851-9ab7-272001aa24ec">
-  <instance xsi:type="esdl:Instance" name="Untitled instance" id="9af52a01-24e2-4bbe-a7b8-f868161e6ca3">
+<esdl:EnergySystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:esdl="http://www.tno.nl/esdl" version="13" description="" esdlVersion="v2207" name="PoC Tutorial_SmartControlOptimized_grow_optimizer_with_pressure" id="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b">
+  <instance xsi:type="esdl:Instance" id="9af52a01-24e2-4bbe-a7b8-f868161e6ca3" name="Untitled instance">
     <area xsi:type="esdl:Area" name="Untitled area" id="9edf5aa3-3855-4dac-b6f5-01c2edf1a43a">
-      <KPIs xsi:type="esdl:KPIs" id="5737d7a4-25c9-4b79-a7a4-6f4aa4b71872">
+      <KPIs xsi:type="esdl:KPIs" id="3af463ec-d209-4d7a-84fd-d628e6ef0622">
         <kpi xsi:type="esdl:DistributionKPI" name="High level cost breakdown [EUR] (yearly averaged)">
           <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" value="2600748.8297758754" label="CAPEX"/>
-            <stringItem xsi:type="esdl:StringItem" value="7046221.367797825" label="OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="2600748.829775875" label="CAPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="7046221.367797828" label="OPEX"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="High level cost breakdown [EUR] (30.0 year period)">
           <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" value="78022464.89327626" label="CAPEX"/>
-            <stringItem xsi:type="esdl:StringItem" value="211386641.03393474" label="OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="78022464.89327624" label="CAPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="211386641.03393483" label="OPEX"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="Overall cost breakdown [EUR] (yearly averaged)">
           <distribution xsi:type="esdl:StringLabelDistribution">
             <stringItem xsi:type="esdl:StringItem" value="433333.3333333333" label="Installation"/>
             <stringItem xsi:type="esdl:StringItem" value="2167415.496442542" label="Investment"/>
-            <stringItem xsi:type="esdl:StringItem" value="2261192.581687319" label="Variable OPEX"/>
-            <stringItem xsi:type="esdl:StringItem" value="4785028.786110505" label="Fixed OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="2261192.5816873275" label="Variable OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="4785028.786110501" label="Fixed OPEX"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="Overall cost breakdown [EUR] (30.0 year period)">
           <distribution xsi:type="esdl:StringLabelDistribution">
             <stringItem xsi:type="esdl:StringItem" value="13000000.0" label="Installation"/>
-            <stringItem xsi:type="esdl:StringItem" value="65022464.89327626" label="Investment"/>
-            <stringItem xsi:type="esdl:StringItem" value="67835777.45061958" label="Variable OPEX"/>
-            <stringItem xsi:type="esdl:StringItem" value="143550863.58331516" label="Fixed OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="65022464.89327625" label="Investment"/>
+            <stringItem xsi:type="esdl:StringItem" value="67835777.45061982" label="Variable OPEX"/>
+            <stringItem xsi:type="esdl:StringItem" value="143550863.583315" label="Fixed OPEX"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="CAPEX breakdown [EUR] (30.0 year period)">
           <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" value="21962571.965276264" label="ResidualHeatSource"/>
+            <stringItem xsi:type="esdl:StringItem" value="21962571.965276252" label="ResidualHeatSource"/>
             <stringItem xsi:type="esdl:StringItem" value="8059892.928000001" label="Pipe"/>
             <stringItem xsi:type="esdl:StringItem" value="48000000.0" label="HeatingDemand"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="OPEX breakdown [EUR] (yearly averaged)">
           <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" value="7046221.367797825" label="ResidualHeatSource"/>
+            <stringItem xsi:type="esdl:StringItem" value="7046221.367797828" label="ResidualHeatSource"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="OPEX breakdown [EUR] (30.0 year period)">
           <distribution xsi:type="esdl:StringLabelDistribution">
-            <stringItem xsi:type="esdl:StringItem" value="211386641.03393474" label="ResidualHeatSource"/>
+            <stringItem xsi:type="esdl:StringItem" value="211386641.03393486" label="ResidualHeatSource"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="Energy production [Wh] (yearly averaged)">
           <distribution xsi:type="esdl:StringLabelDistribution">
             <stringItem xsi:type="esdl:StringItem" value="22611925816.873276" label="ResidualHeatSource_72d7"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="ENERGY" unit="WATTHOUR"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" physicalQuantity="ENERGY"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="Area_76a7: Asset cost breakdown [EUR]">
           <distribution xsi:type="esdl:StringLabelDistribution">
             <stringItem xsi:type="esdl:StringItem" value="1000000.0" label="Installation"/>
             <stringItem xsi:type="esdl:StringItem" value="15000000.0" label="Investment"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="Area_9d0f: Asset cost breakdown [EUR]">
           <distribution xsi:type="esdl:StringLabelDistribution">
             <stringItem xsi:type="esdl:StringItem" value="1000000.0" label="Installation"/>
             <stringItem xsi:type="esdl:StringItem" value="15000000.0" label="Investment"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
         <kpi xsi:type="esdl:DistributionKPI" name="Area_a58a: Asset cost breakdown [EUR]">
           <distribution xsi:type="esdl:StringLabelDistribution">
             <stringItem xsi:type="esdl:StringItem" value="1000000.0" label="Installation"/>
             <stringItem xsi:type="esdl:StringItem" value="15000000.0" label="Investment"/>
           </distribution>
-          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" physicalQuantity="COST" unit="EURO"/>
+          <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST"/>
         </kpi>
       </KPIs>
-      <asset xsi:type="esdl:ResidualHeatSource" name="ResidualHeatSource_72d7" id="72d74fb5-134f-4bfb-829e-220ab76a8a7b" power="7975047.976850842">
+      <asset xsi:type="esdl:ResidualHeatSource" name="ResidualHeatSource_72d7" power="7975047.976850836" id="72d74fb5-134f-4bfb-829e-220ab76a8a7b">
         <costInformation xsi:type="esdl:CostInformation" id="123cc46e-f8ef-42f9-842f-08e77dd06899">
-          <fixedOperationalCosts xsi:type="esdl:SingleValue" id="8ee43904-745d-4f5c-8b15-5a2adcde7e5f" value="600000.0">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="4c3a445d-d13f-4f61-8d75-22280135830f" description="Cost in EUR/MW" perMultiplier="MEGA"/>
+          <fixedOperationalCosts xsi:type="esdl:SingleValue" value="600000.0" id="8ee43904-745d-4f5c-8b15-5a2adcde7e5f">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="4c3a445d-d13f-4f61-8d75-22280135830f"/>
           </fixedOperationalCosts>
-          <marginalCosts xsi:type="esdl:SingleValue" id="e52de449-7340-4878-b582-d20711d9fb14" value="1.0">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR" physicalQuantity="COST" id="4fccbb6b-2e41-46d9-a92c-f94da7c3aca7" unit="EURO"/>
-          </marginalCosts>
-          <variableOperationalCosts xsi:type="esdl:SingleValue" id="e5bc1b5e-23b1-4985-94f2-bea25c12da14" value="100.0">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATTHOUR" unit="EURO" physicalQuantity="COST" id="de56cc5d-2baa-451c-b38c-47abea1393c2" description="Cost in EUR/MWh" perMultiplier="MEGA"/>
+          <variableOperationalCosts xsi:type="esdl:SingleValue" value="100.0" id="e5bc1b5e-23b1-4985-94f2-bea25c12da14">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MWh" perMultiplier="MEGA" perUnit="WATTHOUR" unit="EURO" physicalQuantity="COST" id="de56cc5d-2baa-451c-b38c-47abea1393c2"/>
           </variableOperationalCosts>
-          <investmentCosts xsi:type="esdl:SingleValue" id="3102215e-50a4-4332-b16e-2fd6522df31b" value="1500000.0">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="69673880-fe81-4f34-8fd9-558cc693a251" description="Cost in EUR/MW" perMultiplier="MEGA"/>
+          <investmentCosts xsi:type="esdl:SingleValue" value="1500000.0" id="3102215e-50a4-4332-b16e-2fd6522df31b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="69673880-fe81-4f34-8fd9-558cc693a251"/>
           </investmentCosts>
-          <installationCosts xsi:type="esdl:SingleValue" id="12c24715-08dc-4b61-ae15-76541704c83a" value="10000000.0">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR" physicalQuantity="COST" id="89b04c83-eb32-49a3-adc4-492a719221d3" unit="EURO"/>
+          <marginalCosts xsi:type="esdl:SingleValue" value="1.0" id="e52de449-7340-4878-b582-d20711d9fb14">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="4fccbb6b-2e41-46d9-a92c-f94da7c3aca7"/>
+          </marginalCosts>
+          <installationCosts xsi:type="esdl:SingleValue" value="10000000.0" id="12c24715-08dc-4b61-ae15-76541704c83a">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="89b04c83-eb32-49a3-adc4-492a719221d3"/>
           </installationCosts>
         </costInformation>
-        <geometry xsi:type="esdl:Point" CRS="WGS84" lat="52.00467202060717" lon="4.372987747192384"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="d890f8aa-9b94-493d-b017-bd7cebaf8c77" connectedTo="07c2f88e-85be-4b8b-a72e-14364a3810c9">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="fa1bb0f9-a001-4e31-a474-e1e26467db15">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="d890f8aa-9b94-493d-b017-bd7cebaf8c77" connectedTo="07c2f88e-85be-4b8b-a72e-14364a3810c9">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="fb7381d7-a0e7-40c9-a94d-dd0ea78cc9ee">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="9a5a0271-2754-4aff-bb83-598719eb9710">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="594ec404-3cf5-4a01-9f88-aae2bd048db1">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="a01e36ad-6c32-4dbd-b8e3-df35edb0e0de">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="8afe76eb-975d-46e6-bcf0-f066097342d5">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" port="8096" field="Pump_power" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="68bc6c74-1428-4427-a3c1-f4b1ecfabe08">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='72d74fb5-134f-4bfb-829e-220ab76a8a7b'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Pump_power" id="0311c6ff-61a2-4c56-9a68-4b71a13524e0">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
         </port>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In" connectedTo="c0a27794-98e2-4119-a363-cec4f0b525cd" id="4d6c18cd-cc52-443d-8e53-96cd188dd1a8"/>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="c0a27794-98e2-4119-a363-cec4f0b525cd" id="4d6c18cd-cc52-443d-8e53-96cd188dd1a8"/>
+        <geometry xsi:type="esdl:Point" lon="4.372987747192384" CRS="WGS84" lat="52.00467202060717"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" length="818.07" innerDiameter="0.1603" name="Pipe1" related="Pipe1_ret" id="Pipe1" outerDiameter="0.25" diameter="DN150">
+      <asset xsi:type="esdl:Pipe" name="Pipe1" diameter="DN150" innerDiameter="0.1603" length="818.07" id="Pipe1" related="Pipe1_ret" outerDiameter="0.25">
         <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
-          <investmentCosts xsi:type="esdl:SingleValue" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs" value="1126.4">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d" description="Costs in EUR/m"/>
+          <investmentCosts xsi:type="esdl:SingleValue" value="1126.4" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d"/>
           </investmentCosts>
         </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="d890f8aa-9b94-493d-b017-bd7cebaf8c77" id="07c2f88e-85be-4b8b-a72e-14364a3810c9"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="fc2801d0-215b-4d2b-9846-ee4918b87e21" connectedTo="d149871b-d76a-4cc3-8922-c8d99205f47e">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="918e21cc-081f-493e-a9f4-2fff233be194">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="f60b6f37-f023-4f87-a3f5-98fd6d9be5ef">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="2849c102-8efd-4c89-8ee1-20038984bd0c">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
+          </profile>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe1'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="eb10d2b0-77ad-41e5-a171-dbdf12024de4">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
+          </profile>
+        </port>
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lat="52.00467202060717" lon="4.372987747192384"/>
-          <point xsi:type="esdl:Point" lat="52.00210934629504" lon="4.365863800048829"/>
-          <point xsi:type="esdl:Point" lat="51.99996926872789" lon="4.367129802703858"/>
+          <point xsi:type="esdl:Point" lon="4.372987747192384" lat="52.00467202060717"/>
+          <point xsi:type="esdl:Point" lon="4.365863800048829" lat="52.00210934629504"/>
+          <point xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
         </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.004">
-            <matter xsi:type="esdl:Material" name="steel" id="fa85538e-ebfa-4bce-8386-04980e793e18" thermalConductivity="52.15"/>
+            <matter xsi:type="esdl:Material" id="fa85538e-ebfa-4bce-8386-04980e793e18" thermalConductivity="52.15" name="steel"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.03725">
-            <matter xsi:type="esdl:Material" name="PUR" id="3bafa031-f40f-42fc-b409-e35fffe5f457" thermalConductivity="0.027"/>
+            <matter xsi:type="esdl:Material" id="3bafa031-f40f-42fc-b409-e35fffe5f457" thermalConductivity="0.027" name="PUR"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0036">
-            <matter xsi:type="esdl:Material" name="HDPE" id="893337e3-58f1-4fb4-8c25-68d71b11fb71" thermalConductivity="0.4"/>
+            <matter xsi:type="esdl:Material" id="893337e3-58f1-4fb4-8c25-68d71b11fb71" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="d890f8aa-9b94-493d-b017-bd7cebaf8c77" id="07c2f88e-85be-4b8b-a72e-14364a3810c9"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="fc2801d0-215b-4d2b-9846-ee4918b87e21" connectedTo="d149871b-d76a-4cc3-8922-c8d99205f47e">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="ddd6e0ef-bba6-4bc5-8d35-3eeffe570194">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Joint" name="Joint_a04c" id="a04cb927-426d-4016-a084-356002a85d6c">
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="fc2801d0-215b-4d2b-9846-ee4918b87e21" id="d149871b-d76a-4cc3-8922-c8d99205f47e"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="3535f436-1270-4b1b-a326-41d69cd6e330" connectedTo="863d2ff2-7a68-4bfb-8aa5-dab741b72b25 7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7"/>
+        <geometry xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe2" diameter="DN400" innerDiameter="0.3938" length="517.54" id="Pipe2" related="Pipe2_ret" outerDiameter="0.56">
+        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
+          <investmentCosts xsi:type="esdl:SingleValue" value="2840.6" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="863d2ff2-7a68-4bfb-8aa5-dab741b72b25"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="8c38fc93-ed85-42ef-9be6-87d47c416e90" connectedTo="4d629e6e-5db4-4a8f-9945-934a24ede11a">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="e80062a4-6119-473a-89c9-731c14c797e1">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="c0ca2f6a-558c-41df-9ac3-a0e27f4583c1">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="2d8f9f19-a717-4095-be51-5b247e2e4016">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="34a39dfe-7369-42f9-8ff5-0e49f96bd12c">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="159ca679-8a66-458f-87fa-e4f04bed2d29">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="3f53c1fc-7188-40be-a208-3443eac62c77">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe2'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="8b4b5b01-9def-41fa-8fde-dffbd5656347">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Joint" name="Joint_a04c" id="a04cb927-426d-4016-a084-356002a85d6c">
-        <geometry xsi:type="esdl:Point" lat="51.99996926872789" lon="4.367129802703858"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="fc2801d0-215b-4d2b-9846-ee4918b87e21" id="d149871b-d76a-4cc3-8922-c8d99205f47e"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="3535f436-1270-4b1b-a326-41d69cd6e330" connectedTo="863d2ff2-7a68-4bfb-8aa5-dab741b72b25 7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7"/>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="517.54" innerDiameter="0.3938" name="Pipe2" related="Pipe2_ret" id="Pipe2" outerDiameter="0.56" diameter="DN400">
-        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
-          <investmentCosts xsi:type="esdl:SingleValue" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs" value="2840.6">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d" description="Costs in EUR/m"/>
-          </investmentCosts>
-        </costInformation>
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lat="51.99996926872789" lon="4.367129802703858"/>
-          <point xsi:type="esdl:Point" lat="51.995622746921015" lon="4.36983346939087"/>
+          <point xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
+          <point xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
         </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0063">
-            <matter xsi:type="esdl:Material" name="steel" id="74d84321-1767-4cec-b6e7-b90c06020400" thermalConductivity="52.15"/>
+            <matter xsi:type="esdl:Material" id="74d84321-1767-4cec-b6e7-b90c06020400" thermalConductivity="52.15" name="steel"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0711">
-            <matter xsi:type="esdl:Material" name="PUR" id="95012cd9-7648-4df5-8c83-74dc73bc16ba" thermalConductivity="0.027"/>
+            <matter xsi:type="esdl:Material" id="95012cd9-7648-4df5-8c83-74dc73bc16ba" thermalConductivity="0.027" name="PUR"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0057">
-            <matter xsi:type="esdl:Material" name="HDPE" id="1392ee3f-34f6-4c8e-ab0e-635b9d7ec9be" thermalConductivity="0.4"/>
+            <matter xsi:type="esdl:Material" id="1392ee3f-34f6-4c8e-ab0e-635b9d7ec9be" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="863d2ff2-7a68-4bfb-8aa5-dab741b72b25"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="8c38fc93-ed85-42ef-9be6-87d47c416e90" connectedTo="4d629e6e-5db4-4a8f-9945-934a24ede11a">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="c03319a6-c0c1-438e-99f7-949b4287b30e">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe3" diameter="DN400" innerDiameter="0.3938" length="1182.23" id="Pipe3" related="Pipe3_ret" outerDiameter="0.56">
+        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
+          <investmentCosts xsi:type="esdl:SingleValue" value="2840.6" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="e44060e9-8b0e-41e5-ae46-ce074c891c15"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="13edd58c-4a04-4770-8aac-c6e8689acbba" connectedTo="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="26d1b399-ff7f-43ed-9ee8-922c78ba8648">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="d1adcd50-d4e2-4f7d-99c7-bf202cddafce">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="95609f55-8ce5-4618-9dea-9d57d933729c">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="9ec394f1-93bc-4b3e-ab15-fc1e509a0a92">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="1872035e-3e9f-4f70-94e4-d79d10f40ff5">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="6a20ac6e-0d82-4eb2-b7a3-eebb7de97b04">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe3'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="4f0d1361-cecf-4a0e-80dd-52dcd1afe5a7">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="1182.23" innerDiameter="0.3938" name="Pipe3" related="Pipe3_ret" id="Pipe3" outerDiameter="0.56" diameter="DN400">
-        <costInformation xsi:type="esdl:CostInformation" id="4a3d48d9-74bb-4407-b249-9e2af4d1037c">
-          <investmentCosts xsi:type="esdl:SingleValue" id="2ab2214c-8d42-4b74-877f-7fb97f6eab86" name="Combined investment and installation costs" value="2840.6">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="9169bd50-197f-4d6b-aaac-b383a59c815d" description="Costs in EUR/m"/>
-          </investmentCosts>
-        </costInformation>
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" lat="51.995622746921015" lon="4.36983346939087"/>
-          <point xsi:type="esdl:Point" lat="51.989029496545015" lon="4.373888969421388"/>
-          <point xsi:type="esdl:Point" lat="51.99069441691871" lon="4.379038810729981"/>
+          <point xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
+          <point xsi:type="esdl:Point" lon="4.373888969421388" lat="51.989029496545015"/>
+          <point xsi:type="esdl:Point" lon="4.379038810729981" lat="51.99069441691871"/>
         </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0063">
-            <matter xsi:type="esdl:Material" name="steel" id="74d84321-1767-4cec-b6e7-b90c06020400" thermalConductivity="52.15"/>
+            <matter xsi:type="esdl:Material" id="74d84321-1767-4cec-b6e7-b90c06020400" thermalConductivity="52.15" name="steel"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0711">
-            <matter xsi:type="esdl:Material" name="PUR" id="95012cd9-7648-4df5-8c83-74dc73bc16ba" thermalConductivity="0.027"/>
+            <matter xsi:type="esdl:Material" id="95012cd9-7648-4df5-8c83-74dc73bc16ba" thermalConductivity="0.027" name="PUR"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0057">
-            <matter xsi:type="esdl:Material" name="HDPE" id="1392ee3f-34f6-4c8e-ab0e-635b9d7ec9be" thermalConductivity="0.4"/>
+            <matter xsi:type="esdl:Material" id="1392ee3f-34f6-4c8e-ab0e-635b9d7ec9be" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="e44060e9-8b0e-41e5-ae46-ce074c891c15"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="13edd58c-4a04-4770-8aac-c6e8689acbba" connectedTo="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="bc9e7f14-ad02-474a-825a-932cd069d72c">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Joint" name="Joint_95ca" id="95caf7c7-e89f-4378-96f2-f904f9255c83">
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="8c38fc93-ed85-42ef-9be6-87d47c416e90" id="4d629e6e-5db4-4a8f-9945-934a24ede11a"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="a42acf83-361d-4d4d-8001-8617daad939a" connectedTo="e44060e9-8b0e-41e5-ae46-ce074c891c15 20165ec3-cf86-41e4-976f-079ba0ca5be4"/>
+        <geometry xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe4" diameter="DN300" innerDiameter="0.3127" length="455.4" id="Pipe4" related="Pipe4_ret" outerDiameter="0.45">
+        <costInformation xsi:type="esdl:CostInformation" id="384df56d-e3f0-4794-a0e2-bc0c71482e45">
+          <investmentCosts xsi:type="esdl:SingleValue" value="1962.1" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="983f0959-8566-43ce-a380-782d29406ed3"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="5169316d-ae93-4f04-9a34-7c776444b651" connectedTo="2c5a109b-0d98-47b6-acc1-05e1708f8b85">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="feade102-caa0-4231-beb2-b79b19d74ace">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="82dda185-0ff5-49f9-97e5-27a1643e66f6">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="37ca48d1-6257-44fc-8cd3-390b904cb8be">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="0de31681-1807-4c3b-a2de-c27969c50188">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="cd582fdf-3918-4916-85fe-38f18f24a6e9">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="ea96091f-e500-4157-a880-a3b7e494c5a6">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe4'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="14aed742-6c8f-4f73-9652-9874c2b84770">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Joint" name="Joint_95ca" id="95caf7c7-e89f-4378-96f2-f904f9255c83">
-        <geometry xsi:type="esdl:Point" lat="51.995622746921015" lon="4.36983346939087"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="8c38fc93-ed85-42ef-9be6-87d47c416e90" id="4d629e6e-5db4-4a8f-9945-934a24ede11a"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="a42acf83-361d-4d4d-8001-8617daad939a" connectedTo="e44060e9-8b0e-41e5-ae46-ce074c891c15 20165ec3-cf86-41e4-976f-079ba0ca5be4"/>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="455.4" innerDiameter="0.3127" name="Pipe4" related="Pipe4_ret" id="Pipe4" outerDiameter="0.45" diameter="DN300">
-        <costInformation xsi:type="esdl:CostInformation" id="384df56d-e3f0-4794-a0e2-bc0c71482e45">
-          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" name="Combined investment and installation costs" value="1962.1">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="983f0959-8566-43ce-a380-782d29406ed3" description="Costs in EUR/m"/>
-          </investmentCosts>
-        </costInformation>
         <geometry xsi:type="esdl:Line" CRS="WGS84">
-          <point xsi:type="esdl:Point" lat="51.99996926872789" lon="4.367129802703858"/>
-          <point xsi:type="esdl:Point" lat="52.00105253065436" lon="4.373545646667481"/>
+          <point xsi:type="esdl:Point" lon="4.367129802703858" lat="51.99996926872789"/>
+          <point xsi:type="esdl:Point" lon="4.373545646667481" lat="52.00105253065436"/>
         </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
-            <matter xsi:type="esdl:Material" name="steel" id="f4cee538-cc3b-4809-bd66-979f2ce9649b" thermalConductivity="52.15"/>
+            <matter xsi:type="esdl:Material" id="f4cee538-cc3b-4809-bd66-979f2ce9649b" thermalConductivity="52.15" name="steel"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
-            <matter xsi:type="esdl:Material" name="PUR" id="e4c0350c-cd79-45b4-a45c-6259c750b478" thermalConductivity="0.027"/>
+            <matter xsi:type="esdl:Material" id="e4c0350c-cd79-45b4-a45c-6259c750b478" thermalConductivity="0.027" name="PUR"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
-            <matter xsi:type="esdl:Material" name="HDPE" id="9a97f588-10fe-4a34-b0f2-277862151763" thermalConductivity="0.4"/>
+            <matter xsi:type="esdl:Material" id="9a97f588-10fe-4a34-b0f2-277862151763" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="3535f436-1270-4b1b-a326-41d69cd6e330" id="7f18f0b7-fcf3-4d83-8a65-79cbd3273ea7"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="5169316d-ae93-4f04-9a34-7c776444b651" connectedTo="2c5a109b-0d98-47b6-acc1-05e1708f8b85">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="02e82a22-06bb-423d-92c9-bed040556a8a">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe5" diameter="DN300" innerDiameter="0.3127" length="252.3" id="Pipe5" related="Pipe5_ret" outerDiameter="0.45">
+        <costInformation xsi:type="esdl:CostInformation" id="4c8d9c8f-7e99-4402-8f66-d413e73db121">
+          <investmentCosts xsi:type="esdl:SingleValue" value="1962.1" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Costs in EUR/m" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="983f0959-8566-43ce-a380-782d29406ed3"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="20165ec3-cf86-41e4-976f-079ba0ca5be4"/>
+        <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" id="787c6ae3-96da-41e1-af86-6e68a1e28cb1" connectedTo="01caa60f-1549-4f3f-817e-e4e6807b2398">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="25b8b04c-2c77-4f23-87c2-9b8d70e08b38">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="6cb18438-aa0f-4cb5-aa45-d3ef164b8cf9">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="3e074e37-a91a-43bd-9828-f9085c3be477">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="640f44b1-5eec-455e-b909-bb966387f80a">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="b2b39836-f105-4d89-976b-e4e191e7b171">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="aa853c39-864d-4934-b9b4-85d6554913f1">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='Pipe5'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="70677723-223c-4149-92e0-a3808a8edb89">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="252.3" innerDiameter="0.3127" name="Pipe5" related="Pipe5_ret" id="Pipe5" outerDiameter="0.45" diameter="DN300">
-        <costInformation xsi:type="esdl:CostInformation" id="4c8d9c8f-7e99-4402-8f66-d413e73db121">
-          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" name="Combined investment and installation costs" value="1962.1">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="METRE" unit="EURO" physicalQuantity="COST" id="983f0959-8566-43ce-a380-782d29406ed3" description="Costs in EUR/m"/>
-          </investmentCosts>
-        </costInformation>
         <geometry xsi:type="esdl:Line" CRS="WGS84">
-          <point xsi:type="esdl:Point" lat="51.995622746921015" lon="4.36983346939087"/>
-          <point xsi:type="esdl:Point" lat="51.99648151568376" lon="4.373245239257813"/>
+          <point xsi:type="esdl:Point" lon="4.36983346939087" lat="51.995622746921015"/>
+          <point xsi:type="esdl:Point" lon="4.373245239257813" lat="51.99648151568376"/>
         </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
-            <matter xsi:type="esdl:Material" name="steel" id="f4cee538-cc3b-4809-bd66-979f2ce9649b" thermalConductivity="52.15"/>
+            <matter xsi:type="esdl:Material" id="f4cee538-cc3b-4809-bd66-979f2ce9649b" thermalConductivity="52.15" name="steel"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
-            <matter xsi:type="esdl:Material" name="PUR" id="e4c0350c-cd79-45b4-a45c-6259c750b478" thermalConductivity="0.027"/>
+            <matter xsi:type="esdl:Material" id="e4c0350c-cd79-45b4-a45c-6259c750b478" thermalConductivity="0.027" name="PUR"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
-            <matter xsi:type="esdl:Material" name="HDPE" id="9a97f588-10fe-4a34-b0f2-277862151763" thermalConductivity="0.4"/>
+            <matter xsi:type="esdl:Material" id="9a97f588-10fe-4a34-b0f2-277862151763" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
         <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="a42acf83-361d-4d4d-8001-8617daad939a" id="20165ec3-cf86-41e4-976f-079ba0ca5be4"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Out" id="787c6ae3-96da-41e1-af86-6e68a1e28cb1" connectedTo="01caa60f-1549-4f3f-817e-e4e6807b2398">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="7b31a108-776f-4dfd-990c-dafb8c7e1cff">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="30b55292-2e01-41e4-aea7-6438f52cabb3">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="90b9accb-0945-45d7-99f1-4ece8126a5d6">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
-          </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="10e42ce5-0660-4c47-b4be-8e1f621151f7">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
-          </profile>
-        </port>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_a04c_ret" id="076ba789-3040-4952-9b2b-fbf9ed05e6bd">
-        <geometry xsi:type="esdl:Point" CRS="WGS84" lat="52.000059268817886" lon="4.3663488762941665"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port" connectedTo="c5df4e61-6603-4315-a45a-196903690d9e 23d8b6bb-9480-4f02-ba7c-d00de8ff206e" id="1ba08c64-4c54-4f23-93bf-2b2f6c04229d"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port" id="044ef084-2a9e-4356-bac2-207f5361d4ce" connectedTo="2c3c73cb-d282-4c97-a060-922c91c50180"/>
+        <port xsi:type="esdl:InPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="c5df4e61-6603-4315-a45a-196903690d9e 23d8b6bb-9480-4f02-ba7c-d00de8ff206e" id="1ba08c64-4c54-4f23-93bf-2b2f6c04229d"/>
+        <port xsi:type="esdl:OutPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="044ef084-2a9e-4356-bac2-207f5361d4ce" connectedTo="2c3c73cb-d282-4c97-a060-922c91c50180"/>
+        <geometry xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_95ca_ret" id="b4a5be45-3352-4837-94d6-b110aa842da6">
-        <geometry xsi:type="esdl:Point" CRS="WGS84" lat="51.99571274701101" lon="4.369031429215318"/>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port" connectedTo="59b53a77-a253-4a96-81ef-84e719a1f518 6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" id="6b4d9bba-484b-46aa-bfe6-895d491b6747"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="ret_port" id="5a47482f-6cdf-41b3-91b0-014578ee8143" connectedTo="da70a1aa-53c4-496e-ba63-2c04674b8c84"/>
+        <port xsi:type="esdl:InPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="59b53a77-a253-4a96-81ef-84e719a1f518 6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" id="6b4d9bba-484b-46aa-bfe6-895d491b6747"/>
+        <port xsi:type="esdl:OutPort" name="ret_port" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="5a47482f-6cdf-41b3-91b0-014578ee8143" connectedTo="da70a1aa-53c4-496e-ba63-2c04674b8c84"/>
+        <geometry xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" length="818.07" innerDiameter="0.1603" name="Pipe1_ret" related="Pipe1" id="Pipe1_ret" outerDiameter="0.25" diameter="DN150">
-        <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="52.000059268817886" lon="4.3663488762941665"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="52.00219934638504" lon="4.365092860885141"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="52.004762020697164" lon="4.372228431895539"/>
-        </geometry>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret" connectedTo="044ef084-2a9e-4356-bac2-207f5361d4ce" id="2c3c73cb-d282-4c97-a060-922c91c50180"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret" id="c0a27794-98e2-4119-a363-cec4f0b525cd" connectedTo="4d6c18cd-cc52-443d-8e53-96cd188dd1a8">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="758fd02e-fb01-44d3-a0d1-fd293bda35fd">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      <asset xsi:type="esdl:Pipe" name="Pipe1_ret" diameter="DN150" innerDiameter="0.1603" length="818.07" id="Pipe1_ret" related="Pipe1" outerDiameter="0.25">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="044ef084-2a9e-4356-bac2-207f5361d4ce" id="2c3c73cb-d282-4c97-a060-922c91c50180"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="c0a27794-98e2-4119-a363-cec4f0b525cd" connectedTo="4d6c18cd-cc52-443d-8e53-96cd188dd1a8">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="f03ebc7c-a6bc-4a4b-a3ea-6106b95dd0c4">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="c2eee1f0-e4c7-4bc1-8818-fbb1f8f0df1f">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="1d340515-6d1c-49e2-a4a1-01105057f8a9">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="21ed4022-89fc-4887-a656-673c571734d9">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="6a22fe12-2bae-46a3-920f-cd83b5e457fe">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe1_ret'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="d59c5535-a19b-496a-928c-5f707d3f81ca">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe1_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="681d73b5-0990-467b-9b5c-fae1e57e7a6a">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
+          <point xsi:type="esdl:Point" lon="4.365092860885141" CRS="WGS84" lat="52.00219934638504"/>
+          <point xsi:type="esdl:Point" lon="4.372228431895539" CRS="WGS84" lat="52.004762020697164"/>
+        </geometry>
         <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.004">
-            <matter xsi:type="esdl:Material" name="steel" id="fa85538e-ebfa-4bce-8386-04980e793e18" thermalConductivity="52.15"/>
+            <matter xsi:type="esdl:Material" id="fa85538e-ebfa-4bce-8386-04980e793e18" thermalConductivity="52.15" name="steel"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.03725">
-            <matter xsi:type="esdl:Material" name="PUR" id="3bafa031-f40f-42fc-b409-e35fffe5f457" thermalConductivity="0.027"/>
+            <matter xsi:type="esdl:Material" id="3bafa031-f40f-42fc-b409-e35fffe5f457" thermalConductivity="0.027" name="PUR"/>
           </component>
           <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0036">
-            <matter xsi:type="esdl:Material" name="HDPE" id="893337e3-58f1-4fb4-8c25-68d71b11fb71" thermalConductivity="0.4"/>
+            <matter xsi:type="esdl:Material" id="893337e3-58f1-4fb4-8c25-68d71b11fb71" thermalConductivity="0.4" name="HDPE"/>
           </component>
         </material>
       </asset>
-      <asset xsi:type="esdl:Pipe" length="517.54" innerDiameter="0.3938" name="Pipe2_ret" related="Pipe2" id="Pipe2_ret" outerDiameter="0.56" diameter="DN400">
-        <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="51.99571274701101" lon="4.369031429215318"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="52.000059268817886" lon="4.3663488762941665"/>
-        </geometry>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret" connectedTo="5a47482f-6cdf-41b3-91b0-014578ee8143" id="da70a1aa-53c4-496e-ba63-2c04674b8c84"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret" id="c5df4e61-6603-4315-a45a-196903690d9e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="bd4bd802-2b04-4e1e-baf4-ae475d0a5a19">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      <asset xsi:type="esdl:Pipe" name="Pipe2_ret" diameter="DN400" innerDiameter="0.3938" length="517.54" id="Pipe2_ret" related="Pipe2" outerDiameter="0.56">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="5a47482f-6cdf-41b3-91b0-014578ee8143" id="da70a1aa-53c4-496e-ba63-2c04674b8c84"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="c5df4e61-6603-4315-a45a-196903690d9e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="e9487d83-306a-46da-982b-89adc1d9a687">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="a5ebb71e-d4da-4b22-9aa5-4843ca16bc0b">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="6633075c-7bc3-493f-8d3a-22130f84fdd8">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="240b458b-ea10-477b-a9de-62a374403b65">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="5ce2a07d-b9ed-4faf-a85e-d04f460c84b8">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe2_ret'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="9ff5e0d9-4289-4659-9d08-2a13fba49173">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe2_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="73a1e4d0-04be-42fb-ab30-e9b18b44d66b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="1182.23" innerDiameter="0.3938" name="Pipe3_ret" related="Pipe3" id="Pipe3_ret" outerDiameter="0.56" diameter="DN400">
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="51.990784417008705" lon="4.378211386257638"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="51.98911949663501" lon="4.37305259776345"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="51.99571274701101" lon="4.369031429215318"/>
+          <point xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
+          <point xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
         </geometry>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret" connectedTo="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" id="6d1edc18-1962-4d3d-9882-ef27ae1702e8"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret" id="59b53a77-a253-4a96-81ef-84e719a1f518" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="9dd4685e-f90c-455d-a692-0aac0c2be5b2">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe3_ret" diameter="DN400" innerDiameter="0.3938" length="1182.23" id="Pipe3_ret" related="Pipe3" outerDiameter="0.56">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" id="6d1edc18-1962-4d3d-9882-ef27ae1702e8"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="59b53a77-a253-4a96-81ef-84e719a1f518" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="f22d8c94-228c-4e37-8b60-2ac1975752c5">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="973dce5d-47de-4da1-acab-08a81f82ebb8">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="59cd7b34-6eac-4a5d-9eaa-9fd547fbfeac">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="5f3750c7-4041-4aad-a4d0-aa8718b9c2fd">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="0f689974-3f3d-4469-8a21-82cff309f8d1">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe3_ret'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="ae7177d8-cc0e-40db-a853-20ad95091eb1">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe3_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="63f759fa-8b2e-4513-824f-ee607dd08dbe">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="455.4" innerDiameter="0.3127" name="Pipe4_ret" related="Pipe4" id="Pipe4_ret" outerDiameter="0.45" diameter="DN300">
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="52.00114253074436" lon="4.372769808163894"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="52.000059268817886" lon="4.3663488762941665"/>
+          <point xsi:type="esdl:Point" lon="4.378211386257638" CRS="WGS84" lat="51.990784417008705"/>
+          <point xsi:type="esdl:Point" lon="4.37305259776345" CRS="WGS84" lat="51.98911949663501"/>
+          <point xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
         </geometry>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret" connectedTo="d7eb3623-7481-41bb-911d-2dd9bd67db39" id="5e2f4591-43f2-489f-8eb2-63105dbd0355"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret" id="23d8b6bb-9480-4f02-ba7c-d00de8ff206e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="1174dffe-bcd7-483b-8e2a-05c01dfbf0e6">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe4_ret" diameter="DN300" innerDiameter="0.3127" length="455.4" id="Pipe4_ret" related="Pipe4" outerDiameter="0.45">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="d7eb3623-7481-41bb-911d-2dd9bd67db39" id="5e2f4591-43f2-489f-8eb2-63105dbd0355"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="23d8b6bb-9480-4f02-ba7c-d00de8ff206e" connectedTo="1ba08c64-4c54-4f23-93bf-2b2f6c04229d">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="61ff2954-4794-4b11-8b69-2f80d2b14f82">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="afb57ce7-6a33-46b8-b3c4-98139ff807e2">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="c612ec82-b8bb-49fa-8022-05924da708e9">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="862ea643-91be-4cef-9f99-07f03b471cd9">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="f9e7568d-c8c2-41c7-9998-6fb8e47a40d7">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe4_ret'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="d9c620e5-018d-49fd-b48b-44e638b947ab">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe4_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="52fcc1de-7c7e-4002-a9e7-5e6f40350a0b">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
-      </asset>
-      <asset xsi:type="esdl:Pipe" length="252.3" innerDiameter="0.3127" name="Pipe5_ret" related="Pipe5" id="Pipe5_ret" outerDiameter="0.45" diameter="DN300">
         <geometry xsi:type="esdl:Line">
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="51.99657151577376" lon="4.372447461880088"/>
-          <point xsi:type="esdl:Point" CRS="WGS84" lat="51.99571274701101" lon="4.369031429215318"/>
+          <point xsi:type="esdl:Point" lon="4.372769808163894" CRS="WGS84" lat="52.00114253074436"/>
+          <point xsi:type="esdl:Point" lon="4.3663488762941665" CRS="WGS84" lat="52.000059268817886"/>
         </geometry>
-        <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="In_ret" connectedTo="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" id="35ddd90a-e45c-4afd-95b4-80ce6c927071"/>
-        <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out_ret" id="6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747">
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="8acc9735-83a7-4434-894d-18901f0fd8a9">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" name="Pipe5_ret" diameter="DN300" innerDiameter="0.3127" length="252.3" id="Pipe5_ret" related="Pipe5" outerDiameter="0.45">
+        <port xsi:type="esdl:InPort" name="In_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" connectedTo="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" id="35ddd90a-e45c-4afd-95b4-80ce6c927071"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="6f9268a0-1fd9-42f6-8821-2d7d4a6e5618" connectedTo="6b4d9bba-484b-46aa-bfe6-895d491b6747">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="f6d11794-7f58-4439-82a6-35dc2a547643">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="75c4c0f7-0040-4115-b61b-2e00954b6e7e">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="0ab11bcb-1d17-44ab-ab53-68a5b0218eeb">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="4aa26dae-130c-47eb-8d74-58fcd5dcf1cc">
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="5472e3da-6405-43a7-b5ce-506e2b02acc9">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
           </profile>
-          <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='Pipe5_ret'" port="8096" field="PostProc.Velocity" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="e4f438a1-716f-454b-a44b-1b0d3c97f177">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" physicalQuantity="SPEED" perTimeUnit="SECOND"/>
+          <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" filters="&quot;assetId&quot;='Pipe5_ret'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="PostProc.Velocity" id="fa6b3114-f033-46c2-8b2a-c7244c42aba0">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="METRE" perTimeUnit="SECOND" physicalQuantity="SPEED"/>
           </profile>
         </port>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.372447461880088" CRS="WGS84" lat="51.99657151577376"/>
+          <point xsi:type="esdl:Point" lon="4.369031429215318" CRS="WGS84" lat="51.99571274701101"/>
+        </geometry>
       </asset>
       <area xsi:type="esdl:Area" name="Area_76a7" id="76a75122-8ea6-472d-8059-374830275d72">
-        <KPIs xsi:type="esdl:KPIs" id="80a90b53-210e-4d40-8673-c61fb84a84a1">
+        <KPIs xsi:type="esdl:KPIs" id="cea749a3-f8e8-42d6-8452-f6d89643d4bf">
           <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
@@ -469,62 +469,62 @@
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="7.4" name="Total energy consumed [GWh]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" physicalQuantity="ENERGY" multiplier="GIGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" multiplier="GIGA" physicalQuantity="ENERGY"/>
           </kpi>
         </KPIs>
-        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_b0ff" id="b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c" power="15000000.0">
+        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_b0ff" power="15000000.0" id="b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c">
           <costInformation xsi:type="esdl:CostInformation" id="cd676c1c-6224-406f-a864-3e7ff55265e0">
-            <investmentCosts xsi:type="esdl:SingleValue" id="08f06cd1-471b-404a-8894-27b315775b59" value="1000000.0">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="f8e5bc00-6eae-47d6-b7ad-b9699879b14c" description="Cost in EUR/MW" perMultiplier="MEGA"/>
+            <investmentCosts xsi:type="esdl:SingleValue" value="1000000.0" id="08f06cd1-471b-404a-8894-27b315775b59">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="f8e5bc00-6eae-47d6-b7ad-b9699879b14c"/>
             </investmentCosts>
-            <installationCosts xsi:type="esdl:SingleValue" id="829c1c62-4266-4560-ac77-b961b7a722cf" value="1000000.0">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR" physicalQuantity="COST" id="1c0a9d42-bb5a-44c1-9ed6-824d7c82e932" unit="EURO"/>
+            <installationCosts xsi:type="esdl:SingleValue" value="1000000.0" id="829c1c62-4266-4560-ac77-b961b7a722cf">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="1c0a9d42-bb5a-44c1-9ed6-824d7c82e932"/>
             </installationCosts>
           </costInformation>
-          <geometry xsi:type="esdl:Point" CRS="WGS84" lat="52.00105253065436" lon="4.373545646667481"/>
-          <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="5169316d-ae93-4f04-9a34-7c776444b651" id="2c5a109b-0d98-47b6-acc1-05e1708f8b85">
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" filters="" multiplier="2.0" port="443" field="demand4_MW" startDate="2018-12-31T23:00:00.000000+0000" database="energy_profiles" measurement="WarmingUp default profiles" id="b8150ac7-ea23-4be6-b5a3-b6974b8df58d">
+          <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="5169316d-ae93-4f04-9a34-7c776444b651" id="2c5a109b-0d98-47b6-acc1-05e1708f8b85">
+            <profile xsi:type="esdl:InfluxDBProfile" multiplier="2.0" database="energy_profiles" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" measurement="WarmingUp default profiles" filters="" startDate="2018-12-31T23:00:00.000000+0000" port="443" field="demand4_MW" id="b8150ac7-ea23-4be6-b5a3-b6974b8df58d">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
             </profile>
           </port>
-          <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out" id="d7eb3623-7481-41bb-911d-2dd9bd67db39" connectedTo="5e2f4591-43f2-489f-8eb2-63105dbd0355">
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="829bfe62-95d4-4d96-8459-d5984a3738ed">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+          <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="d7eb3623-7481-41bb-911d-2dd9bd67db39" connectedTo="5e2f4591-43f2-489f-8eb2-63105dbd0355">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="aa3fe4ae-6a04-4d09-8b4f-ae178fa046ca">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
             </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="a5d756e2-29dd-4037-84d7-c39d695ab3e1">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="415265ab-4cad-4a48-880e-122fb6fadaa4">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
             </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="eb7065bf-d56c-457a-b4e9-c293fc652e70">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='b0ff0df6-4a47-43a5-a0a5-aa10975c0a5c'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="beb8795c-2600-4e20-895e-b2dc5fbce535">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
             </profile>
           </port>
+          <geometry xsi:type="esdl:Point" lon="4.373545646667481" CRS="WGS84" lat="52.00105253065436"/>
         </asset>
         <geometry xsi:type="esdl:Polygon" CRS="WGS84">
           <exterior xsi:type="esdl:SubPolygon">
-            <point xsi:type="esdl:Point" lat="52.003232185574326" lon="4.376142024993897"/>
-            <point xsi:type="esdl:Point" lat="52.002228236493224" lon="4.372107982635499"/>
-            <point xsi:type="esdl:Point" lat="52.0031132980428" lon="4.3712711334228525"/>
-            <point xsi:type="esdl:Point" lat="52.00197724570447" lon="4.366979598999024"/>
-            <point xsi:type="esdl:Point" lat="51.99826505971136" lon="4.369254112243653"/>
-            <point xsi:type="esdl:Point" lat="51.99945404958839" lon="4.373760223388673"/>
-            <point xsi:type="esdl:Point" lat="51.995635958872874" lon="4.3776869773864755"/>
-            <point xsi:type="esdl:Point" lat="51.9963626102222" lon="4.380712509155274"/>
+            <point xsi:type="esdl:Point" lon="4.376142024993897" lat="52.003232185574326"/>
+            <point xsi:type="esdl:Point" lon="4.372107982635499" lat="52.002228236493224"/>
+            <point xsi:type="esdl:Point" lon="4.3712711334228525" lat="52.0031132980428"/>
+            <point xsi:type="esdl:Point" lon="4.366979598999024" lat="52.00197724570447"/>
+            <point xsi:type="esdl:Point" lon="4.369254112243653" lat="51.99826505971136"/>
+            <point xsi:type="esdl:Point" lon="4.373760223388673" lat="51.99945404958839"/>
+            <point xsi:type="esdl:Point" lon="4.3776869773864755" lat="51.995635958872874"/>
+            <point xsi:type="esdl:Point" lon="4.380712509155274" lat="51.9963626102222"/>
           </exterior>
         </geometry>
       </area>
       <area xsi:type="esdl:Area" name="Area_9d0f" id="9d0fd9ed-662c-42ec-a417-7e789737084c">
-        <KPIs xsi:type="esdl:KPIs" id="6d05c05e-4c1d-41bb-807f-2089f1ad46c1">
+        <KPIs xsi:type="esdl:KPIs" id="3aaf2fbb-0c6f-4bc0-b85c-0e1de95434f8">
           <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
@@ -533,60 +533,60 @@
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="7.4" name="Total energy consumed [GWh]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" physicalQuantity="ENERGY" multiplier="GIGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" multiplier="GIGA" physicalQuantity="ENERGY"/>
           </kpi>
         </KPIs>
-        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_08fd" id="08fd3385-681a-4211-a083-51775cc99daa" power="15000000.0">
+        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_08fd" power="15000000.0" id="08fd3385-681a-4211-a083-51775cc99daa">
           <costInformation xsi:type="esdl:CostInformation" id="7eac6b5e-ba11-4ef1-b90e-599dd2690d20">
-            <investmentCosts xsi:type="esdl:SingleValue" id="26aba0b6-a1a0-4610-97b3-be763548c669" value="1000000.0">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="424508c6-24aa-4a35-81e9-7ae198cbaeb8" description="Cost in EUR/MW" perMultiplier="MEGA"/>
+            <investmentCosts xsi:type="esdl:SingleValue" value="1000000.0" id="26aba0b6-a1a0-4610-97b3-be763548c669">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="424508c6-24aa-4a35-81e9-7ae198cbaeb8"/>
             </investmentCosts>
-            <installationCosts xsi:type="esdl:SingleValue" id="3b93383a-2ec4-4b35-9335-ebd91f0de600" value="1000000.0">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR" physicalQuantity="COST" id="318840e0-6f48-46f4-b9c9-91315d7b45fd" unit="EURO"/>
+            <installationCosts xsi:type="esdl:SingleValue" value="1000000.0" id="3b93383a-2ec4-4b35-9335-ebd91f0de600">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="318840e0-6f48-46f4-b9c9-91315d7b45fd"/>
             </installationCosts>
           </costInformation>
-          <geometry xsi:type="esdl:Point" CRS="WGS84" lat="51.99648151568376" lon="4.373245239257813"/>
-          <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="787c6ae3-96da-41e1-af86-6e68a1e28cb1" id="01caa60f-1549-4f3f-817e-e4e6807b2398">
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" filters="" multiplier="2.0" port="443" field="demand4_MW" startDate="2018-12-31T23:00:00.000000+0000" database="energy_profiles" measurement="WarmingUp default profiles" id="ddd73fb0-d96f-4127-8d39-869455c77930">
+          <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="787c6ae3-96da-41e1-af86-6e68a1e28cb1" id="01caa60f-1549-4f3f-817e-e4e6807b2398">
+            <profile xsi:type="esdl:InfluxDBProfile" multiplier="2.0" database="energy_profiles" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" measurement="WarmingUp default profiles" filters="" startDate="2018-12-31T23:00:00.000000+0000" port="443" field="demand4_MW" id="ddd73fb0-d96f-4127-8d39-869455c77930">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
             </profile>
           </port>
-          <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out" id="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" connectedTo="35ddd90a-e45c-4afd-95b4-80ce6c927071">
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="d08c3468-f9c4-4f49-9bf6-0c8821479aa3">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+          <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="ca90e0a5-f866-4ec2-9b3b-07f054f1c2b2" connectedTo="35ddd90a-e45c-4afd-95b4-80ce6c927071">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="a0e01afa-89d8-4729-af8d-8d6c46ff5f11">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
             </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="2950c318-3821-45d2-80c1-9a45b9e2606b">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="5ca43660-eb7c-4b7f-929d-628b93c9c029">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
             </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="6fb4c58b-b11e-4fca-b8c6-f5c39fa33a56">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='08fd3385-681a-4211-a083-51775cc99daa'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="02869e6d-7ae1-4492-8eb7-73d1fe6adcf1">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
             </profile>
           </port>
+          <geometry xsi:type="esdl:Point" lon="4.373245239257813" CRS="WGS84" lat="51.99648151568376"/>
         </asset>
         <geometry xsi:type="esdl:Polygon" CRS="WGS84">
           <exterior xsi:type="esdl:SubPolygon">
-            <point xsi:type="esdl:Point" lat="51.99817258139733" lon="4.3692970275878915"/>
-            <point xsi:type="esdl:Point" lat="51.99932194116153" lon="4.373695850372315"/>
-            <point xsi:type="esdl:Point" lat="51.99534529503086" lon="4.376678466796876"/>
-            <point xsi:type="esdl:Point" lat="51.99624370444482" lon="4.38081979751587"/>
-            <point xsi:type="esdl:Point" lat="51.99490929572965" lon="4.381613731384278"/>
-            <point xsi:type="esdl:Point" lat="51.99272923553559" lon="4.372708797454835"/>
+            <point xsi:type="esdl:Point" lon="4.3692970275878915" lat="51.99817258139733"/>
+            <point xsi:type="esdl:Point" lon="4.373695850372315" lat="51.99932194116153"/>
+            <point xsi:type="esdl:Point" lon="4.376678466796876" lat="51.99534529503086"/>
+            <point xsi:type="esdl:Point" lon="4.38081979751587" lat="51.99624370444482"/>
+            <point xsi:type="esdl:Point" lon="4.381613731384278" lat="51.99490929572965"/>
+            <point xsi:type="esdl:Point" lon="4.372708797454835" lat="51.99272923553559"/>
           </exterior>
         </geometry>
       </area>
       <area xsi:type="esdl:Area" name="Area_a58a" id="a58a988c-95c1-492b-bc63-b125d25f5108">
-        <KPIs xsi:type="esdl:KPIs" id="42f2ebc5-9f5a-4b33-8a0e-7dc3ac79918c">
+        <KPIs xsi:type="esdl:KPIs" id="2e6cec30-c38a-4194-976a-716d31037b6e">
           <kpi xsi:type="esdl:DoubleKPI" value="15.0" name="Investment">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="1.0" name="Installation">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Variable OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Fixed OPEX (year 1)">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" multiplier="MEGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" multiplier="MEGA" physicalQuantity="COST"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" name="Estimated energy from local source(s) [%]">
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
@@ -595,54 +595,54 @@
             <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PERCENT"/>
           </kpi>
           <kpi xsi:type="esdl:DoubleKPI" value="6.6" name="Total energy consumed [GWh]">
-            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" physicalQuantity="ENERGY" multiplier="GIGA"/>
+            <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATTHOUR" multiplier="GIGA" physicalQuantity="ENERGY"/>
           </kpi>
         </KPIs>
-        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_8fbe" id="8fbe3d4e-5d5b-4489-9271-9969c2b9e589" power="15000000.0">
+        <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_8fbe" power="15000000.0" id="8fbe3d4e-5d5b-4489-9271-9969c2b9e589">
           <costInformation xsi:type="esdl:CostInformation" id="32e59a3e-fe5e-4201-bbd6-4f26dc4c961e">
-            <investmentCosts xsi:type="esdl:SingleValue" id="3971c64d-50e4-47ec-a769-1f91935065d9" value="1000000.0">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="5a0e43e1-b141-4626-87eb-487cdb70e60e" description="Cost in EUR/MW" perMultiplier="MEGA"/>
+            <investmentCosts xsi:type="esdl:SingleValue" value="1000000.0" id="3971c64d-50e4-47ec-a769-1f91935065d9">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR/MW" perMultiplier="MEGA" perUnit="WATT" unit="EURO" physicalQuantity="COST" id="5a0e43e1-b141-4626-87eb-487cdb70e60e"/>
             </investmentCosts>
-            <installationCosts xsi:type="esdl:SingleValue" id="850701a9-ec9a-40c5-ab3e-e0dbe6165cb6" value="1000000.0">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Cost in EUR" physicalQuantity="COST" id="b18cdc99-6303-404c-958a-1a4c079f842d" unit="EURO"/>
+            <installationCosts xsi:type="esdl:SingleValue" value="1000000.0" id="850701a9-ec9a-40c5-ab3e-e0dbe6165cb6">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" physicalQuantity="COST" description="Cost in EUR" id="b18cdc99-6303-404c-958a-1a4c079f842d"/>
             </installationCosts>
           </costInformation>
-          <geometry xsi:type="esdl:Point" CRS="WGS84" lat="51.99069441691871" lon="4.379038810729981"/>
-          <port xsi:type="esdl:InPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="In" connectedTo="13edd58c-4a04-4770-8aac-c6e8689acbba" id="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c">
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" filters="" multiplier="2.0" port="443" field="demand3_MW" startDate="2018-12-31T23:00:00.000000+0000" database="energy_profiles" measurement="WarmingUp default profiles" id="5ae97047-619a-4119-84f3-848b36743e5d">
+          <port xsi:type="esdl:InPort" name="In" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" connectedTo="13edd58c-4a04-4770-8aac-c6e8689acbba" id="23cdb929-5cfc-4b8d-963e-06b6e6cf3a5c">
+            <profile xsi:type="esdl:InfluxDBProfile" multiplier="2.0" database="energy_profiles" endDate="2019-12-31T22:00:00.000000+0000" host="profiles.warmingup.info" measurement="WarmingUp default profiles" filters="" startDate="2018-12-31T23:00:00.000000+0000" port="443" field="demand3_MW" id="5ae97047-619a-4119-84f3-848b36743e5d">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
             </profile>
           </port>
-          <port xsi:type="esdl:OutPort" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Out" id="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" connectedTo="6d1edc18-1962-4d3d-9882-ef27ae1702e8">
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" port="8096" field="HeatIn.Q" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="101a8f23-4763-454e-9b5b-666a3ef39061">
-              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" physicalQuantity="FLOW" perTimeUnit="SECOND"/>
+          <port xsi:type="esdl:OutPort" name="Out" carrier="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" id="0fd050fa-15ff-4f1e-b0bd-ef1823365eaa" connectedTo="6d1edc18-1962-4d3d-9882-ef27ae1702e8">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.Q" id="ae9c6ad9-86f8-4050-a36c-0c987fb0dd54">
+              <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="CUBIC_METRE" perTimeUnit="SECOND" physicalQuantity="FLOW"/>
             </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" port="8096" field="Heat_flow" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="0a30a8e3-7928-4b34-a543-284617001ffc">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="Heat_flow" id="e2815516-bb3e-4372-bdd1-b25bdaac89d7">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="WATT" physicalQuantity="POWER"/>
             </profile>
-            <profile xsi:type="esdl:InfluxDBProfile" endDate="2019-12-31T23:00:00.000000+0000" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" port="8096" field="HeatIn.H" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" startDate="2018-12-31T23:00:00.000000+0000" database="b3020a9c-3f81-4851-9ab7-272001aa24ec" host="omotes_influxdb" id="e5a98660-3a7c-4853-b95e-ccade436be76">
+            <profile xsi:type="esdl:InfluxDBProfile" database="e03bf7aa-5fd6-4133-a569-7da4b7a34c8b" endDate="2019-12-31T23:00:00.000000+0000" host="omotes_influxdb" measurement="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" filters="&quot;assetId&quot;='8fbe3d4e-5d5b-4489-9271-9969c2b9e589'" startDate="2018-12-31T23:00:00.000000+0000" port="8096" field="HeatIn.H" id="dbefec20-2b34-496b-867a-fd3d31a64463">
               <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="PASCAL" physicalQuantity="PRESSURE"/>
             </profile>
           </port>
+          <geometry xsi:type="esdl:Point" lon="4.379038810729981" CRS="WGS84" lat="51.99069441691871"/>
         </asset>
         <geometry xsi:type="esdl:Polygon" CRS="WGS84">
           <exterior xsi:type="esdl:SubPolygon">
-            <point xsi:type="esdl:Point" lat="51.992279997820766" lon="4.372987747192384"/>
-            <point xsi:type="esdl:Point" lat="51.994235470276436" lon="4.382214546203614"/>
-            <point xsi:type="esdl:Point" lat="51.989333415199866" lon="4.38581943511963"/>
-            <point xsi:type="esdl:Point" lat="51.98688879367896" lon="4.37633514404297"/>
+            <point xsi:type="esdl:Point" lon="4.372987747192384" lat="51.992279997820766"/>
+            <point xsi:type="esdl:Point" lon="4.382214546203614" lat="51.994235470276436"/>
+            <point xsi:type="esdl:Point" lon="4.38581943511963" lat="51.989333415199866"/>
+            <point xsi:type="esdl:Point" lon="4.37633514404297" lat="51.98688879367896"/>
           </exterior>
         </geometry>
       </area>
     </area>
   </instance>
   <energySystemInformation xsi:type="esdl:EnergySystemInformation" id="5fa7e6e3-5701-48a7-bbbd-cad59a46f6c5">
-    <quantityAndUnits xsi:type="esdl:QuantityAndUnits" id="38f7850a-2090-411e-a15a-84b1d7b78362">
-      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" multiplier="MEGA" unit="WATT" physicalQuantity="POWER" id="e9405fc8-5e57-4df5-8584-4babee7cdf1b" description="Power in MW"/>
-    </quantityAndUnits>
     <carriers xsi:type="esdl:Carriers" id="42a694c6-9a1b-4cc7-bbae-0b44725f9434">
-      <carrier xsi:type="esdl:HeatCommodity" name="Primary" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" supplyTemperature="80.0"/>
-      <carrier xsi:type="esdl:HeatCommodity" name="Primary_ret" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" returnTemperature="40.0"/>
+      <carrier xsi:type="esdl:HeatCommodity" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6" name="Primary" supplyTemperature="80.0"/>
+      <carrier xsi:type="esdl:HeatCommodity" id="9f6aeb1a-138b-4bb9-9a09-d524e94658e6_ret" name="Primary_ret" returnTemperature="40.0"/>
     </carriers>
+    <quantityAndUnits xsi:type="esdl:QuantityAndUnits" id="38f7850a-2090-411e-a15a-84b1d7b78362">
+      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" description="Power in MW" multiplier="MEGA" unit="WATT" physicalQuantity="POWER" id="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
+    </quantityAndUnits>
   </energySystemInformation>
 </esdl:EnergySystem>