diff --git a/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/ates_mapper.py b/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/ates_mapper.py
index 76685d66..2615f992 100644
--- a/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/ates_mapper.py
+++ b/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/ates_mapper.py
@@ -66,11 +66,14 @@ def to_entity(self, esdl_asset: EsdlAssetObject) -> AssetAbstract:
             salinity=esdl_asset.get_property(
                 esdl_property_name="salinity", default_value=ATES_DEFAULTS.salinity
             ),
+            well_distance=esdl_asset.get_property(
+                esdl_property_name="wellDistance", default_value=ATES_DEFAULTS.well_distance
+            ),
             well_casing_size=esdl_asset.get_property(
                 esdl_property_name="wellCasingSize", default_value=ATES_DEFAULTS.well_casing_size
             ),
-            well_distance=esdl_asset.get_property(
-                esdl_property_name="wellDistance", default_value=ATES_DEFAULTS.well_distance
+            maximum_flowrate=esdl_asset.get_property(
+                esdl_property_name="maximumFlowRate", default_value=ATES_DEFAULTS.maximum_flowrate
             ),
         )
 
diff --git a/src/omotes_simulator_core/entities/assets/asset_defaults.py b/src/omotes_simulator_core/entities/assets/asset_defaults.py
index da075063..07892d38 100644
--- a/src/omotes_simulator_core/entities/assets/asset_defaults.py
+++ b/src/omotes_simulator_core/entities/assets/asset_defaults.py
@@ -28,6 +28,7 @@
 DEFAULT_POWER = 500000.0  # [W]
 DEFAULT_MISSING_VALUE = -9999.99  # [-]
 DEFAULT_ROUGHNESS = 1e-3  # [m]
+DEFAULT_GRAVITY_ACCELERATION = 9.81  # m/s2
 
 
 @dataclass
@@ -78,10 +79,11 @@ class AtesDefaults:
     aquifer_permeability: float = 10000.0  # mD
     aquifer_anisotropy: float = 4.0  # -
     salinity: float = 10000.0  # ppm
-    well_casing_size: float = 13.0  # inch
     well_distance: float = 150.0  # meters
     maximum_flow_charge: float = 200.0  # m3/h
     maximum_flow_discharge: float = 200.0  # m3/h
+    well_casing_size: float = 31.0 * 0.0254  # meters
+    maximum_flowrate: float = 500.0  # m3/h
 
 
 @dataclass
diff --git a/src/omotes_simulator_core/entities/assets/ates_cluster.py b/src/omotes_simulator_core/entities/assets/ates_cluster.py
index e024335d..32a149d8 100644
--- a/src/omotes_simulator_core/entities/assets/ates_cluster.py
+++ b/src/omotes_simulator_core/entities/assets/ates_cluster.py
@@ -21,6 +21,7 @@
 
 from omotes_simulator_core.entities.assets.asset_abstract import AssetAbstract
 from omotes_simulator_core.entities.assets.asset_defaults import (
+    DEFAULT_GRAVITY_ACCELERATION,
     DEFAULT_TEMPERATURE,
     DEFAULT_TEMPERATURE_DIFFERENCE,
     PROPERTY_HEAT_DEMAND,
@@ -37,6 +38,7 @@
     kelvin_to_celcius,
 )
 from omotes_simulator_core.solver.network.assets.production_asset import HeatBoundary
+from omotes_simulator_core.solver.utils.fluid_properties import fluid_props
 
 logger = logging.getLogger(__name__)
 
@@ -81,11 +83,14 @@ class AtesCluster(AssetAbstract):
     """The salinity of the aquifer [ppm]."""
 
     well_casing_size: float
-    """The casing size of the well [inch]."""
+    """The casing size of the well [m]."""
 
     well_distance: float
     """The distance of the well [m]."""
 
+    maximum_flowrate: float
+    """The maximum flowrate of ATES [m3/h]."""
+
     pyjnius_loader: PyjniusLoader
     """Loader object to delay importing pyjnius module and Java classes."""
 
@@ -102,8 +107,9 @@ def __init__(
         aquifer_permeability: float,
         aquifer_anisotropy: float,
         salinity: float,
-        well_casing_size: float,
         well_distance: float,
+        well_casing_size: float,
+        maximum_flowrate: float,
     ) -> None:
         """Initialize a AtesCluster object.
 
@@ -127,8 +133,10 @@ def __init__(
         self.aquifer_permeability = aquifer_permeability  # mD
         self.aquifer_anisotropy = aquifer_anisotropy  # -
         self.salinity = salinity  # ppm
-        self.well_casing_size = well_casing_size  # inch
         self.well_distance = well_distance  # meters
+        self.well_casing_size = well_casing_size  # meters
+        self.max_charge_volume_flow = maximum_flowrate
+        self.max_discharge_volume_flow = maximum_flowrate
 
         # Output list
         self.output: list = []
@@ -229,38 +237,38 @@ def _init_rosim(self) -> None:
 
         # overwrite template value with ESDL properties for ROSIM input
 
-        MODEL_TOP = self.aquifer_depth - 100
-        AQUIFER_THICKNESS = self.aquifer_thickness
-        NZ_AQUIFER = math.floor(AQUIFER_THICKNESS / 2)
-        NZ = NZ_AQUIFER + 8
-        AQUIFER_TOP = self.aquifer_depth
-        AQUIFER_BASE = self.aquifer_depth + self.aquifer_thickness
-        SURFACE_TEMPERATURE = self.aquifer_mid_temperature - 0.034 * (
+        model_top = self.aquifer_depth - 100
+        aquifer_thickness = self.aquifer_thickness
+        nz_aquifer = math.floor(aquifer_thickness / 2)
+        nz = nz_aquifer + 8
+        aquifer_top = self.aquifer_depth
+        aquifer_base = self.aquifer_depth + self.aquifer_thickness
+        surface_temperature = self.aquifer_mid_temperature - 0.034 * (
             self.aquifer_depth + self.aquifer_thickness / 2
         )
-        AQUIFER_NTG = self.aquifer_net_to_gross
-        AQUIFER_PORO = self.aquifer_porosity
-        AQUIFER_PERM_XY = self.aquifer_permeability
-        AQUIFER_PERM_Z = AQUIFER_PERM_XY / self.aquifer_anisotropy
-        SALINITY = self.salinity
-        WELL2_X = self.well_distance + 300
-        CASING_SIZE = self.well_casing_size
-
-        xml_str = xml_str.replace("$NZ$", str(NZ))
-        xml_str = xml_str.replace("$MODEL_TOP$", str(MODEL_TOP))
+        aquifer_ntg = self.aquifer_net_to_gross
+        aquifer_poro = self.aquifer_porosity
+        aquifer_perm_xy = self.aquifer_permeability
+        aquifer_perm_z = aquifer_perm_xy / self.aquifer_anisotropy
+        salinity = self.salinity
+        well2_x = self.well_distance + 300
+        well_casing_size = self.well_casing_size / 0.0254  # convert to inch
+
+        xml_str = xml_str.replace("$NZ$", str(nz))
+        xml_str = xml_str.replace("$MODEL_TOP$", str(model_top))
         xml_str = xml_str.replace("$TIME_STEP_UNIT$", str(2))
-        xml_str = xml_str.replace("$WELL2_X$", str(WELL2_X))
-        xml_str = xml_str.replace("$AQUIFER_TOP$", str(AQUIFER_TOP))
-        xml_str = xml_str.replace("$AQUIFER_BASE$", str(AQUIFER_BASE))
-        xml_str = xml_str.replace("$CASING_SIZE$", str(CASING_SIZE))
-        xml_str = xml_str.replace("$SURFACE_TEMPERATURE$", str(SURFACE_TEMPERATURE))
-        xml_str = xml_str.replace("$SALINITY$", str(SALINITY))
-        xml_str = xml_str.replace("$NZ_AQUIFER$", str(NZ_AQUIFER))
-        xml_str = xml_str.replace("$AQUIFER_THICKNESS$", str(AQUIFER_THICKNESS))
-        xml_str = xml_str.replace("$AQUIFER_PORO$", str(AQUIFER_PORO))
-        xml_str = xml_str.replace("$AQUIFER_NTG$", str(AQUIFER_NTG))
-        xml_str = xml_str.replace("$AQUIFER_PERM_XY$", str(AQUIFER_PERM_XY))
-        xml_str = xml_str.replace("$AQUIFER_PERM_Z$", str(AQUIFER_PERM_Z))
+        xml_str = xml_str.replace("$WELL2_X$", str(well2_x))
+        xml_str = xml_str.replace("$AQUIFER_TOP$", str(aquifer_top))
+        xml_str = xml_str.replace("$AQUIFER_BASE$", str(aquifer_base))
+        xml_str = xml_str.replace("$CASING_SIZE$", str(well_casing_size))
+        xml_str = xml_str.replace("$SURFACE_TEMPERATURE$", str(surface_temperature))
+        xml_str = xml_str.replace("$SALINITY$", str(salinity))
+        xml_str = xml_str.replace("$NZ_AQUIFER$", str(nz_aquifer))
+        xml_str = xml_str.replace("$AQUIFER_THICKNESS$", str(aquifer_thickness))
+        xml_str = xml_str.replace("$AQUIFER_PORO$", str(aquifer_poro))
+        xml_str = xml_str.replace("$AQUIFER_NTG$", str(aquifer_ntg))
+        xml_str = xml_str.replace("$AQUIFER_PERM_XY$", str(aquifer_perm_xy))
+        xml_str = xml_str.replace("$AQUIFER_PERM_Z$", str(aquifer_perm_z))
 
         temp_xmlfile_path = os.path.join(path, "bin/ates_sequential_temp.xml")
         with open(temp_xmlfile_path, "w") as temp_xmlfile:
@@ -288,30 +296,223 @@ def _init_rosim(self) -> None:
 
     def _run_rosim(self) -> None:
         """Function to calculate storage temperature after injection and production."""
-        volume_flow = self.mass_flowrate * 3600 / 1027  # convert to second and hardcoded saline
-        # density needs to change with PVT calculation
+        average_temperature = (self.temperature_in + self.temperature_out) / 2
+        topside_pressure = (
+            101325  # Pa - assume atmospheric pressure since we don't have measurement
+        )
+        saline_density = self._get_saline_density(topside_pressure, average_temperature)
+
+        volume_flow = self.mass_flowrate * 3600 / saline_density  # convert to second and
+        if volume_flow > 0:
+            volume_flow = min(volume_flow, self.max_charge_volume_flow)
+        if volume_flow < 0:
+            volume_flow = -1 * min(abs(volume_flow), self.max_discharge_volume_flow)
+
+        # hardcoded saline
         timestep = self.time_step / 3600  # convert to hours
 
-        rosim_input__flow = [volume_flow, -1 * volume_flow]  # first elemnt is for producer well
-        # and second element is for injection well, positive flow is going upward and negative flow
-        # is downward
+        rosim_input_flow = [volume_flow, -1 * volume_flow]  # the first element is for hot well
+        # and the second element is for cold well. positive flow is charge and negative flow
+        # is discharge
 
         if volume_flow > 0:
             rosim_input_temperature = [kelvin_to_celcius(self.temperature_in), -1]  # Celcius, -1 in
-            # injection well to make sure it is not used
+        # injection well to make sure it is not used
         elif volume_flow < 0:
             rosim_input_temperature = [
                 -1,
                 kelvin_to_celcius(self.temperature_out),
             ]  # Celcius, -1 in
-            # producer well to make sure it is not used
+        # producer well to make sure it is not used
         else:
             rosim_input_temperature = [-1, -1]  # -1 in both producer and injection well to make
-            # sure it is not used
+        # sure it is not used
 
         ates_temperature = self.rosim.calcTimeStepAndGetTemps(
-            rosim_input__flow, rosim_input_temperature, timestep
+            rosim_input_flow, rosim_input_temperature, timestep
         )
 
         self.hot_well_temperature = celcius_to_kelvin(ates_temperature[0])  # convert to K
         self.cold_well_temperature = celcius_to_kelvin(ates_temperature[1])  # convert to K
+
+    def get_state(self) -> dict[str, float]:
+        """Function to get the state of ATES at current timestep."""
+        max_charge_power, max_discharge_power = self._calculate_max_charge_discharge_power()
+
+        return {"max_charge_power": max_charge_power, "max_discharge_power": max_discharge_power}
+
+    def _calculate_max_charge_discharge_power(self) -> tuple[float, float]:
+        """Function to calculate the maximum charge power and discharge power based on NVOE."""
+        # calculate primary side of heat exchanger
+        average_temperature = (self.temperature_in + self.temperature_out) / 2
+        topside_pressure = 101325  # Pa assumed atmospheric pressure since we don't have measurement
+        saline_density = self._get_saline_density(topside_pressure, average_temperature)
+
+        downhole_pressure = saline_density * DEFAULT_GRAVITY_ACCELERATION * self.aquifer_depth
+
+        max_extraction_flow_cold_well = self._get_max_flowrate_extraction_norm(
+            downhole_pressure, self.cold_well_temperature
+        )
+        max_injection_flow_cold_well = self._get_max_flowrate_injection_norm(
+            downhole_pressure, self.cold_well_temperature
+        )
+
+        max_extraction_flow_hot_well = self._get_max_flowrate_extraction_norm(
+            downhole_pressure, self.hot_well_temperature
+        )
+        max_injection_flow_hot_well = self._get_max_flowrate_injection_norm(
+            downhole_pressure, self.hot_well_temperature
+        )
+
+        self.max_charge_volume_flow = min(
+            max_extraction_flow_cold_well, max_injection_flow_hot_well
+        )
+        self.max_discharge_volume_flow = min(
+            max_injection_flow_cold_well, max_extraction_flow_hot_well
+        )
+
+        # calculate secondary side of heat exchanger
+        average_temperature = (self.temperature_in + self.temperature_out) / 2
+        water_density = fluid_props.get_density(average_temperature)
+        water_heat_capacity = fluid_props.get_heat_capacity(average_temperature)
+
+        max_charge_power = (
+            (self.hot_well_temperature - self.cold_well_temperature)
+            * self.max_charge_volume_flow
+            * water_density
+            / 3600
+            * water_heat_capacity
+        )
+
+        max_discharge_power = (
+            (self.hot_well_temperature - self.cold_well_temperature)
+            * self.max_discharge_volume_flow
+            * water_density
+            / 3600
+            * water_heat_capacity
+        )
+
+        return max_charge_power, max_discharge_power
+
+    def _get_max_flowrate_extraction_norm(self, P: float, T: float) -> float:
+        """Function to calculate the maximum flowrate of production in norm.
+
+        reference equation: NVOE Richtlijnen Ondergrondse Energieopslag, november 2006
+        parameters value: https://www.thermogis.nl/doublet-en-economische-parameters-hto
+        """
+        saline_density = self._get_saline_density(P, T)
+        saline_viscosity = self._get_saline_viscosity(P, T)
+        aquifer_permeability = self.aquifer_permeability * 9.8692326671601e-16  # mD to m2
+        # diameter
+        well_radius = 0.5 * self.well_casing_size  # m
+
+        max_extract_flow_velocity = (
+            2
+            * 60
+            * 60
+            * aquifer_permeability
+            * saline_density
+            * DEFAULT_GRAVITY_ACCELERATION
+            / saline_viscosity
+        )  # m3/h
+
+        max_flowrate = (
+            2 * math.pi * well_radius * self.aquifer_thickness * max_extract_flow_velocity
+        )
+
+        max_flowrate = max_flowrate * self.aquifer_depth * 0.01  # using a depth factor multiplier
+        # (0.01, based on expert judgment) as a function of depth, because ATES is deeper than WKO
+        # and therefore allows a higher flowrate.
+
+        return max_flowrate
+
+    def _get_max_flowrate_injection_norm(self, P: float, T: float) -> float:
+        """Function to calculate the maximum flowrate of injection in norm.
+
+        reference equation: NVOE Richtlijnen Ondergrondse Energieopslag, november 2006
+        parameters value: https://www.thermogis.nl/doublet-en-economische-parameters-hto
+        """
+        saline_density = self._get_saline_density(P, T)
+        saline_viscosity = self._get_saline_viscosity(P, T)
+        aquifer_permeability = self.aquifer_permeability * 9.8692326671601e-16  # mD to m2
+        # diameter
+        well_radius = 0.5 * self.well_casing_size  # m, radius is half of diameter
+
+        cloggingVel = 0.3  # meter/year
+        membraneFilterIndex = 0.1  # s/l2
+        equivLoadHoursPerYear = 3500  # hours
+        max_infiltrate_flow_velocity = (
+            1000
+            * math.pow(
+                576
+                * aquifer_permeability
+                * saline_density
+                * DEFAULT_GRAVITY_ACCELERATION
+                / saline_viscosity,
+                0.6,
+            )
+            * math.sqrt(cloggingVel / (2 * membraneFilterIndex * equivLoadHoursPerYear))
+        )
+
+        max_flowrate = (
+            2 * math.pi * well_radius * self.aquifer_thickness * max_infiltrate_flow_velocity
+        )  # m3/h
+
+        return max_flowrate
+
+    def _get_saline_density(self, P_Pa: float, T_K: float) -> float:
+        """Function to calculate the saline density.
+
+        Input is pressure in Pa and temperature in Celsius. Output is density in kg/m3.
+        """
+        P = P_Pa * 1e-6  # Pa to MPa
+        T = kelvin_to_celcius(T_K)  # K to C
+        S = self.salinity * 1e-6  # ppm to kg/kg
+
+        density_fresh = 1 + 1e-6 * (
+            -80.0 * T
+            - 3.3 * T * T
+            + 0.00175 * T * T * T
+            + 489.0 * P
+            - 2.0 * T * P
+            + 0.016 * T * T * P
+            - 1.3e-5 * T * T * T * P
+            - 0.333 * P * P
+            - 0.002 * T * P * P
+        )
+
+        density = density_fresh + S * (
+            0.668
+            + 0.44 * S
+            + 1e-6
+            * (
+                300.0 * P
+                - 2400.0 * P * S
+                + T * (80.0 + 3.0 * T - 3300.0 * S - 13.0 * P + 47.0 * P * S)
+            )
+        )
+
+        density = density * 1000  # g/cm3 to kg/m3
+
+        return density
+
+    def _get_saline_viscosity(self, P_Pa: float, T_K: float) -> float:
+        """Function to calculate the saline viscosity using Batzle-Wang correlation.
+
+        Input is pressure in Pa and temperature in Celsius. Output is viscosity in Pas.
+        """
+        S = self.salinity * 1e-6  # ppm to kg/kg
+        T = kelvin_to_celcius(T_K)  # K to C
+
+        viscosity = (
+            0.1
+            + 0.333 * S
+            + (1.65 + 91.90 * S * S * S)
+            * math.exp(
+                -(0.42 * math.pow((math.pow(S, 0.8) - 0.17), 2.0) + 0.045) * math.pow(T, 0.8)
+            )
+        )
+
+        viscosity = viscosity * 1e-3  # cP to Pas
+
+        return viscosity
diff --git a/src/omotes_simulator_core/entities/assets/controller/controller_network.py b/src/omotes_simulator_core/entities/assets/controller/controller_network.py
index 1ecc1568..9c856cfd 100644
--- a/src/omotes_simulator_core/entities/assets/controller/controller_network.py
+++ b/src/omotes_simulator_core/entities/assets/controller/controller_network.py
@@ -166,6 +166,8 @@ def set_storage_charge_power(self, factor: float = 1) -> dict:
         for storage in self.storages:
             storage_settings[storage.id] = {
                 PROPERTY_HEAT_DEMAND: +1 * storage.effective_max_charge_power * factor,
+                PROPERTY_TEMPERATURE_OUT: storage.temperature_out,
+                PROPERTY_TEMPERATURE_IN: storage.temperature_in,
             }
         return storage_settings
 
@@ -180,6 +182,8 @@ def set_storage_discharge_power(self, factor: float = 1) -> dict:
             # Discharging is negative (e.g., heat from component/system to the network)
             storage_settings[storage.id] = {
                 PROPERTY_HEAT_DEMAND: -1 * storage.effective_max_discharge_power * factor,
+                PROPERTY_TEMPERATURE_OUT: storage.temperature_out,
+                PROPERTY_TEMPERATURE_IN: storage.temperature_in,
             }
         return storage_settings
 
diff --git a/src/omotes_simulator_core/entities/assets/controller/controller_storage.py b/src/omotes_simulator_core/entities/assets/controller/controller_storage.py
index deecbc3d..014b2003 100644
--- a/src/omotes_simulator_core/entities/assets/controller/controller_storage.py
+++ b/src/omotes_simulator_core/entities/assets/controller/controller_storage.py
@@ -174,6 +174,12 @@ def __init__(
             profile=profile,
         )
 
+    def set_state(self, state: dict[str, float]) -> None:
+        """Update maximum charge and discharge power."""
+        if bool(state):
+            self.effective_max_charge_power = state["max_charge_power"]
+            self.effective_max_discharge_power = state["max_discharge_power"]
+
 
 class ControllerIdealHeatStorage(ControllerStorageAbstract):
     """Class to store the storage for the controller asset."""
diff --git a/testdata/test_ates.esdl b/testdata/test_ates.esdl
index af292619..fdce87e1 100644
--- a/testdata/test_ates.esdl
+++ b/testdata/test_ates.esdl
@@ -1,5 +1,5 @@
 <?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="course_model with return network" id="3b21ab49-fd94-4dda-878d-dcaf651ded78_with_return_network" description="basic" esdlVersion="v2111" version="10">
+<esdl:EnergySystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:esdl="http://www.tno.nl/esdl" name="course_model with return network" id="3b21ab49-fd94-4dda-878d-dcaf651ded78_with_return_network" description="basic" esdlVersion="v2111" version="11">
   <energySystemInformation xsi:type="esdl:EnergySystemInformation" id="9a76b800-6e2c-4e99-a9a5-859f7badd061">
     <carriers xsi:type="esdl:Carriers" id="e84423d9-b617-4fa0-b113-1ba12daacaaf">
       <carrier xsi:type="esdl:HeatCommodity" returnTemperature="40.0" id="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="supply_ret" supplyTemperature="80.0"/>
@@ -15,59 +15,59 @@
     <area xsi:type="esdl:Area" id="a3f3b5d9-2faa-4862-a5b0-d02b219052dd" name="Untitled area">
       <asset xsi:type="esdl:HeatingDemand" name="Pijnacker" id="cc61c52a-29a6-45d3-81e8-ce18ba12f319" minTemperature="40.0" maxTemperature="120.0" power="5000000.0">
         <geometry xsi:type="esdl:Point" lat="52.01906782352804" lon="4.431524276733399"/>
-        <port xsi:type="esdl:InPort" connectedTo="9e1c58ab-ec19-4964-928f-d2a582af6ce8" id="c3eb59bc-037d-4684-918e-df0f54af5b3d" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In">
+        <port xsi:type="esdl:InPort" id="c3eb59bc-037d-4684-918e-df0f54af5b3d" name="In" connectedTo="9e1c58ab-ec19-4964-928f-d2a582af6ce8" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret">
           <profile xsi:type="esdl:InfluxDBProfile" multiplier="5.0" startDate="2018-12-31T23:00:00.000000+0000" filters="" id="131d801f-9f8e-4dc4-9a8a-82725607eedf" measurement="WarmingUp default profiles" database="energy_profiles" host="profiles.warmingup.info" port="443" field="demand2_MW" endDate="2019-12-31T22:00:00.000000+0000">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
           </profile>
         </port>
-        <port xsi:type="esdl:OutPort" id="fcf96c55-8264-41a5-90ee-0977a394a46a" connectedTo="99628a79-e31c-4a99-bf4a-2f788a5d5343" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:OutPort" id="fcf96c55-8264-41a5-90ee-0977a394a46a" name="Out" connectedTo="99628a79-e31c-4a99-bf4a-2f788a5d5343" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:HeatingDemand" name="Delfgauw" id="8805731a-8780-47b4-8204-76ba074564bc" minTemperature="40.0" maxTemperature="120.0" power="5000000.0">
         <geometry xsi:type="esdl:Point" lat="52.0094006941874" lon="4.396162033081056"/>
-        <port xsi:type="esdl:InPort" connectedTo="88b6c35c-7eeb-42e9-ba4e-491fa6c7a6fc" id="69464799-3ec3-4928-a5da-6158a6237c76" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In">
+        <port xsi:type="esdl:InPort" id="69464799-3ec3-4928-a5da-6158a6237c76" name="In" connectedTo="88b6c35c-7eeb-42e9-ba4e-491fa6c7a6fc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret">
           <profile xsi:type="esdl:InfluxDBProfile" multiplier="5.0" startDate="2018-12-31T23:00:00.000000+0000" filters="" id="0380fe5a-611c-4523-9eda-1d0ecd69271e" measurement="WarmingUp default profiles" database="energy_profiles" host="profiles.warmingup.info" port="443" field="demand1_MW" endDate="2019-12-31T22:00:00.000000+0000">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
           </profile>
         </port>
-        <port xsi:type="esdl:OutPort" id="c8625b7f-e9ad-4327-899e-0c6e91e873cb" connectedTo="1467bee7-ed90-49d5-8395-3595408ad1ee" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:OutPort" id="c8625b7f-e9ad-4327-899e-0c6e91e873cb" name="Out" connectedTo="1467bee7-ed90-49d5-8395-3595408ad1ee" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:HeatingDemand" name="Nootdorp" id="156c4afb-4106-4286-8f41-fbf8edc6e5ce" minTemperature="40.0" maxTemperature="120.0" power="5000000.0">
         <geometry xsi:type="esdl:Point" lat="52.04277777849674" lon="4.3912696838378915"/>
-        <port xsi:type="esdl:InPort" connectedTo="22be2ae1-10c0-42eb-abd9-6b115b800283" id="ad377fa7-710f-45e7-9144-1521bef5c1ab" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In">
+        <port xsi:type="esdl:InPort" id="ad377fa7-710f-45e7-9144-1521bef5c1ab" name="In" connectedTo="22be2ae1-10c0-42eb-abd9-6b115b800283" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret">
           <profile xsi:type="esdl:InfluxDBProfile" multiplier="5.0" startDate="2018-12-31T23:00:00.000000+0000" filters="" id="57131b4a-f177-47da-b7d7-788f23eefb5b" measurement="WarmingUp default profiles" database="energy_profiles" host="profiles.warmingup.info" port="443" field="demand3_MW" endDate="2019-12-31T22:00:00.000000+0000">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
           </profile>
         </port>
-        <port xsi:type="esdl:OutPort" id="f46090b9-dcd6-433f-b021-061c839e634c" connectedTo="fdbab763-3e05-49d6-9271-207035c14bcb" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:OutPort" id="f46090b9-dcd6-433f-b021-061c839e634c" name="Out" connectedTo="fdbab763-3e05-49d6-9271-207035c14bcb" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_1126" id="11262f35-3d51-4ce3-9a69-6eb4a6c46c9d">
         <geometry xsi:type="esdl:Point" lon="4.401419162750245" lat="52.01909093233181" CRS="WGS84"/>
-        <port xsi:type="esdl:InPort" connectedTo="7c178a7c-f6cb-4f33-8c4a-076d9131ed8a" id="a8779f8a-3d61-4a97-bfb4-35029175ec97" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="fd562e07-a60c-4f5c-9084-d51e736ff545" connectedTo="a89b5045-f815-4126-a4c8-dc125a99c0f8 b9af6540-8cae-41ce-b0c3-4528e027d3b3" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="a8779f8a-3d61-4a97-bfb4-35029175ec97" name="In" connectedTo="7c178a7c-f6cb-4f33-8c4a-076d9131ed8a" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="fd562e07-a60c-4f5c-9084-d51e736ff545" name="Out" connectedTo="a89b5045-f815-4126-a4c8-dc125a99c0f8 b9af6540-8cae-41ce-b0c3-4528e027d3b3" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe1_ret" name="Pipe1" innerDiameter="0.08" length="1533.2" id="Pipe1" outerDiameter="0.09">
+      <asset xsi:type="esdl:Pipe" name="Pipe1" innerDiameter="0.08" length="1533.2" id="Pipe1" outerDiameter="0.09" related="Pipe1_ret">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lat="52.01909093233181" lon="4.401419162750245"/>
           <point xsi:type="esdl:Point" lat="52.01563438289948" lon="4.391613006591798"/>
           <point xsi:type="esdl:Point" lat="52.0094006941874" lon="4.396162033081056"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="fd562e07-a60c-4f5c-9084-d51e736ff545" id="a89b5045-f815-4126-a4c8-dc125a99c0f8" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="88b6c35c-7eeb-42e9-ba4e-491fa6c7a6fc" connectedTo="69464799-3ec3-4928-a5da-6158a6237c76" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="a89b5045-f815-4126-a4c8-dc125a99c0f8" name="In" connectedTo="fd562e07-a60c-4f5c-9084-d51e736ff545" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="88b6c35c-7eeb-42e9-ba4e-491fa6c7a6fc" name="Out" connectedTo="69464799-3ec3-4928-a5da-6158a6237c76" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe2_ret" name="Pipe2" innerDiameter="0.2" length="44.4" id="Pipe2" outerDiameter="0.21">
+      <asset xsi:type="esdl:Pipe" name="Pipe2" innerDiameter="0.2" length="44.4" id="Pipe2" outerDiameter="0.21" related="Pipe2_ret">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lat="52.019437562955694" lon="4.401097297668458"/>
           <point xsi:type="esdl:Point" lat="52.01909093233181" lon="4.401419162750245"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="7dde77c4-a956-4496-b8b9-e714317cc0f2" id="30f746ff-aca7-4e55-946e-3dcaf2ac7569" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="7c178a7c-f6cb-4f33-8c4a-076d9131ed8a" connectedTo="a8779f8a-3d61-4a97-bfb4-35029175ec97" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="30f746ff-aca7-4e55-946e-3dcaf2ac7569" name="In" connectedTo="7dde77c4-a956-4496-b8b9-e714317cc0f2" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="7c178a7c-f6cb-4f33-8c4a-076d9131ed8a" name="Out" connectedTo="a8779f8a-3d61-4a97-bfb4-35029175ec97" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_91b0" id="91b0e057-84cd-4db3-8d2d-cae02077cbaf">
         <geometry xsi:type="esdl:Point" lon="4.422471821308137" lat="52.02578372981452" CRS="WGS84"/>
-        <port xsi:type="esdl:InPort" connectedTo="607e9ed3-3e2e-4c08-bffe-0d713420cce7" id="6829cf4d-0dd9-43ac-8581-87b9998ca5bc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="416291d2-c5f7-4a87-919a-655924b90eb2" connectedTo="e3b7d0a5-e7d7-4cb2-8a33-e56d2077616b 758212e1-ab7f-44b1-a203-6ed42eb3c6bc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="6829cf4d-0dd9-43ac-8581-87b9998ca5bc" name="In" connectedTo="607e9ed3-3e2e-4c08-bffe-0d713420cce7" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="416291d2-c5f7-4a87-919a-655924b90eb2" name="Out" connectedTo="e3b7d0a5-e7d7-4cb2-8a33-e56d2077616b 758212e1-ab7f-44b1-a203-6ed42eb3c6bc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe3_ret" name="Pipe3" innerDiameter="0.1" length="1157.3" id="Pipe3" outerDiameter="0.11">
+      <asset xsi:type="esdl:Pipe" name="Pipe3" innerDiameter="0.1" length="1157.3" id="Pipe3" outerDiameter="0.11" related="Pipe3_ret">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lat="52.02578372981452" lon="4.422471821308137"/>
           <point xsi:type="esdl:Point" lat="52.02318760445455" lon="4.425044059753419"/>
@@ -75,10 +75,10 @@
           <point xsi:type="esdl:Point" lat="52.018381156483095" lon="4.428133964538575"/>
           <point xsi:type="esdl:Point" lat="52.01906782352804" lon="4.431524276733399"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="416291d2-c5f7-4a87-919a-655924b90eb2" id="e3b7d0a5-e7d7-4cb2-8a33-e56d2077616b" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="9e1c58ab-ec19-4964-928f-d2a582af6ce8" connectedTo="c3eb59bc-037d-4684-918e-df0f54af5b3d" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="e3b7d0a5-e7d7-4cb2-8a33-e56d2077616b" name="In" connectedTo="416291d2-c5f7-4a87-919a-655924b90eb2" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="9e1c58ab-ec19-4964-928f-d2a582af6ce8" name="Out" connectedTo="c3eb59bc-037d-4684-918e-df0f54af5b3d" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe4_ret" name="Pipe4" innerDiameter="0.1" length="2982.2" id="Pipe4" outerDiameter="0.11">
+      <asset xsi:type="esdl:Pipe" name="Pipe4" innerDiameter="0.1" length="2982.2" id="Pipe4" outerDiameter="0.11" related="Pipe4_ret">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lat="52.02578372981452" lon="4.422471821308137"/>
           <point xsi:type="esdl:Point" lat="52.030501921460775" lon="4.419465065002442"/>
@@ -89,37 +89,37 @@
           <point xsi:type="esdl:Point" lat="52.04211787192499" lon="4.393007755279542"/>
           <point xsi:type="esdl:Point" lat="52.04283057060157" lon="4.391098022460938"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="416291d2-c5f7-4a87-919a-655924b90eb2" id="758212e1-ab7f-44b1-a203-6ed42eb3c6bc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="22be2ae1-10c0-42eb-abd9-6b115b800283" connectedTo="ad377fa7-710f-45e7-9144-1521bef5c1ab" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="758212e1-ab7f-44b1-a203-6ed42eb3c6bc" name="In" connectedTo="416291d2-c5f7-4a87-919a-655924b90eb2" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="22be2ae1-10c0-42eb-abd9-6b115b800283" name="Out" connectedTo="ad377fa7-710f-45e7-9144-1521bef5c1ab" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_1126_ret" id="c6fec31e-2c4a-423d-937c-7fc28ea81a21">
         <geometry xsi:type="esdl:Point" lon="4.400719145015912" lat="52.019180932421804" CRS="WGS84"/>
-        <port xsi:type="esdl:InPort" connectedTo="b4a30d86-df7a-4136-9170-55087818800d 35ff6c51-ecdc-419c-9e67-8dbbf4ccaa42" id="c06f582d-1922-47e3-ae04-a740b28353e3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="ret_port"/>
-        <port xsi:type="esdl:OutPort" id="39c08ebb-b7d8-4a85-a226-800c225a8a61" connectedTo="fb153d7c-2dc3-4f53-bbee-f0060efef1c7" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="ret_port"/>
+        <port xsi:type="esdl:InPort" id="c06f582d-1922-47e3-ae04-a740b28353e3" name="ret_port" connectedTo="b4a30d86-df7a-4136-9170-55087818800d 35ff6c51-ecdc-419c-9e67-8dbbf4ccaa42" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="39c08ebb-b7d8-4a85-a226-800c225a8a61" name="ret_port" connectedTo="fb153d7c-2dc3-4f53-bbee-f0060efef1c7" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_91b0_ret" id="b7a46b09-779f-4a57-b73e-ab707ec65842">
         <geometry xsi:type="esdl:Point" lon="4.421796245126029" lat="52.02587372990452" CRS="WGS84"/>
-        <port xsi:type="esdl:InPort" connectedTo="002a5802-e55b-4025-abe9-8d508cfdd78c 0c142bfb-4b38-44aa-b88f-71da247525ef" id="9a5c2e7e-e970-4561-8538-9a4000dee416" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="ret_port"/>
-        <port xsi:type="esdl:OutPort" id="3383078a-72da-4af1-badf-686f43c73018" connectedTo="bbb482fa-f98e-4219-ab7e-d8684b0b4e66" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="ret_port"/>
+        <port xsi:type="esdl:InPort" id="9a5c2e7e-e970-4561-8538-9a4000dee416" name="ret_port" connectedTo="002a5802-e55b-4025-abe9-8d508cfdd78c 0c142bfb-4b38-44aa-b88f-71da247525ef" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="3383078a-72da-4af1-badf-686f43c73018" name="ret_port" connectedTo="bbb482fa-f98e-4219-ab7e-d8684b0b4e66" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe1" name="Pipe1_ret" innerDiameter="0.08" length="1533.2" id="Pipe1_ret" outerDiameter="0.09">
+      <asset xsi:type="esdl:Pipe" name="Pipe1_ret" innerDiameter="0.08" length="1533.2" id="Pipe1_ret" outerDiameter="0.09" related="Pipe1">
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.3954232586139" lat="52.009490694277396" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.3908996472617385" lat="52.015724382989475" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.400719145015912" lat="52.019180932421804" CRS="WGS84"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="c8625b7f-e9ad-4327-899e-0c6e91e873cb" id="1467bee7-ed90-49d5-8395-3595408ad1ee" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="b4a30d86-df7a-4136-9170-55087818800d" connectedTo="c06f582d-1922-47e3-ae04-a740b28353e3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out_ret"/>
+        <port xsi:type="esdl:InPort" id="1467bee7-ed90-49d5-8395-3595408ad1ee" name="In_ret" connectedTo="c8625b7f-e9ad-4327-899e-0c6e91e873cb" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="b4a30d86-df7a-4136-9170-55087818800d" name="Out_ret" connectedTo="c06f582d-1922-47e3-ae04-a740b28353e3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe2" name="Pipe2_ret" innerDiameter="0.2" length="44.4" id="Pipe2_ret" outerDiameter="0.21">
+      <asset xsi:type="esdl:Pipe" name="Pipe2_ret" innerDiameter="0.2" length="44.4" id="Pipe2_ret" outerDiameter="0.21" related="Pipe2">
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.400719145015912" lat="52.019180932421804" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.400398589922203" lat="52.01952756304569" CRS="WGS84"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="39c08ebb-b7d8-4a85-a226-800c225a8a61" id="fb153d7c-2dc3-4f53-bbee-f0060efef1c7" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="095f2c36-395f-4183-a760-80d5362e1de3" connectedTo="f8113571-6167-4850-b558-f97f39a0a3f3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out_ret"/>
+        <port xsi:type="esdl:InPort" id="fb153d7c-2dc3-4f53-bbee-f0060efef1c7" name="In_ret" connectedTo="39c08ebb-b7d8-4a85-a226-800c225a8a61" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="095f2c36-395f-4183-a760-80d5362e1de3" name="Out_ret" connectedTo="f8113571-6167-4850-b558-f97f39a0a3f3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe3" name="Pipe3_ret" innerDiameter="0.1" length="1157.3" id="Pipe3_ret" outerDiameter="0.11">
+      <asset xsi:type="esdl:Pipe" name="Pipe3_ret" innerDiameter="0.1" length="1157.3" id="Pipe3_ret" outerDiameter="0.11" related="Pipe3">
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.4308241714884975" lat="52.01915782361804" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.427431248765651" lat="52.01847115657309" CRS="WGS84"/>
@@ -127,10 +127,10 @@
           <point xsi:type="esdl:Point" lon="4.42435921177036" lat="52.023277604544546" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.421796245126029" lat="52.02587372990452" CRS="WGS84"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="fcf96c55-8264-41a5-90ee-0977a394a46a" id="99628a79-e31c-4a99-bf4a-2f788a5d5343" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="002a5802-e55b-4025-abe9-8d508cfdd78c" connectedTo="9a5c2e7e-e970-4561-8538-9a4000dee416" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out_ret"/>
+        <port xsi:type="esdl:InPort" id="99628a79-e31c-4a99-bf4a-2f788a5d5343" name="In_ret" connectedTo="fcf96c55-8264-41a5-90ee-0977a394a46a" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="002a5802-e55b-4025-abe9-8d508cfdd78c" name="Out_ret" connectedTo="9a5c2e7e-e970-4561-8538-9a4000dee416" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
-      <asset xsi:type="esdl:Pipe" related="Pipe4" name="Pipe4_ret" innerDiameter="0.1" length="2982.2" id="Pipe4_ret" outerDiameter="0.11">
+      <asset xsi:type="esdl:Pipe" name="Pipe4_ret" innerDiameter="0.1" length="2982.2" id="Pipe4_ret" outerDiameter="0.11" related="Pipe4">
         <geometry xsi:type="esdl:Line">
           <point xsi:type="esdl:Point" lon="4.390477502296783" lat="52.04292057069157" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.392385117209615" lat="52.042207872014984" CRS="WGS84"/>
@@ -141,8 +141,8 @@
           <point xsi:type="esdl:Point" lon="4.418805700922162" lat="52.03059192155077" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.421796245126029" lat="52.02587372990452" CRS="WGS84"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="f46090b9-dcd6-433f-b021-061c839e634c" id="fdbab763-3e05-49d6-9271-207035c14bcb" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="0c142bfb-4b38-44aa-b88f-71da247525ef" connectedTo="9a5c2e7e-e970-4561-8538-9a4000dee416" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out_ret"/>
+        <port xsi:type="esdl:InPort" id="fdbab763-3e05-49d6-9271-207035c14bcb" name="In_ret" connectedTo="f46090b9-dcd6-433f-b021-061c839e634c" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="0c142bfb-4b38-44aa-b88f-71da247525ef" name="Out_ret" connectedTo="9a5c2e7e-e970-4561-8538-9a4000dee416" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:Pipe" name="Pipe5_a" innerDiameter="0.15" length="625.29" id="2b5ba02c-bbfe-4bb9-9e4e-48c4c45c53e9" outerDiameter="0.16">
         <geometry xsi:type="esdl:Line">
@@ -150,8 +150,8 @@
           <point xsi:type="esdl:Point" lat="52.02149748382286" lon="4.408371448516847"/>
           <point xsi:type="esdl:Point" lat="52.021827590527295" lon="4.409401416778565"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="fd562e07-a60c-4f5c-9084-d51e736ff545" id="b9af6540-8cae-41ce-b0c3-4528e027d3b3" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="37a4d419-e788-4ca7-a033-3a06c6872fdf" connectedTo="9b3744f2-f9f0-4e32-a118-e116154e1384" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="b9af6540-8cae-41ce-b0c3-4528e027d3b3" name="In" connectedTo="fd562e07-a60c-4f5c-9084-d51e736ff545" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="37a4d419-e788-4ca7-a033-3a06c6872fdf" name="Out" connectedTo="9b3744f2-f9f0-4e32-a118-e116154e1384" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
       <asset xsi:type="esdl:Pipe" name="Pipe5_b" innerDiameter="0.15" length="999.47" id="0f7eed4a-ac9a-4f38-9825-876e41e8c100" outerDiameter="0.16">
         <geometry xsi:type="esdl:Line">
@@ -161,13 +161,13 @@
           <point xsi:type="esdl:Point" lat="52.02567150373549" lon="4.421594738960267"/>
           <point xsi:type="esdl:Point" lat="52.02578372981452" lon="4.422471821308137"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="3a52317d-827b-4dc4-a6df-1b145bbb1736" id="9a462e32-2e53-40ca-97eb-8394b6a3d131" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="607e9ed3-3e2e-4c08-bffe-0d713420cce7" connectedTo="6829cf4d-0dd9-43ac-8581-87b9998ca5bc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="9a462e32-2e53-40ca-97eb-8394b6a3d131" name="In" connectedTo="3a52317d-827b-4dc4-a6df-1b145bbb1736" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="607e9ed3-3e2e-4c08-bffe-0d713420cce7" name="Out" connectedTo="6829cf4d-0dd9-43ac-8581-87b9998ca5bc" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_086f" id="086f467d-afd5-4a87-aad2-0b03f185edef">
         <geometry xsi:type="esdl:Point" lat="52.021827590527295" lon="4.409401416778565"/>
-        <port xsi:type="esdl:InPort" connectedTo="37a4d419-e788-4ca7-a033-3a06c6872fdf" id="9b3744f2-f9f0-4e32-a118-e116154e1384" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="3a52317d-827b-4dc4-a6df-1b145bbb1736" connectedTo="9a462e32-2e53-40ca-97eb-8394b6a3d131 3874047c-96e8-4555-902a-8646daf3f984" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="9b3744f2-f9f0-4e32-a118-e116154e1384" name="In" connectedTo="37a4d419-e788-4ca7-a033-3a06c6872fdf" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="3a52317d-827b-4dc4-a6df-1b145bbb1736" name="Out" connectedTo="9a462e32-2e53-40ca-97eb-8394b6a3d131 3874047c-96e8-4555-902a-8646daf3f984" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
       <asset xsi:type="esdl:Pipe" name="Pipe5_ret_a" innerDiameter="0.1" length="993.35" id="3a1d7c9a-18cd-4360-ae7f-74062a514317" outerDiameter="0.16">
         <geometry xsi:type="esdl:Line">
@@ -177,8 +177,8 @@
           <point xsi:type="esdl:Point" lon="4.413995586196941" lat="52.0233964387484" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lat="52.021920019967986" lon="4.4088220596313485"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="3383078a-72da-4af1-badf-686f43c73018" id="bbb482fa-f98e-4219-ab7e-d8684b0b4e66" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In_ret"/>
-        <port xsi:type="esdl:OutPort" id="23be2b8d-5f5a-471f-875f-b7e20997f7c5" connectedTo="027db45e-289d-4611-94ba-95d04abec30f" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="bbb482fa-f98e-4219-ab7e-d8684b0b4e66" name="In_ret" connectedTo="3383078a-72da-4af1-badf-686f43c73018" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="23be2b8d-5f5a-471f-875f-b7e20997f7c5" name="Out" connectedTo="027db45e-289d-4611-94ba-95d04abec30f" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:Pipe" name="Pipe5_ret_b" innerDiameter="0.1" length="632.79" id="92af5656-dbd3-4ddf-abaa-9ef47ea96333" outerDiameter="0.16">
         <geometry xsi:type="esdl:Line">
@@ -186,39 +186,39 @@
           <point xsi:type="esdl:Point" lon="4.4076804239030505" lat="52.02158748391286" CRS="WGS84"/>
           <point xsi:type="esdl:Point" lon="4.400719145015912" lat="52.019180932421804" CRS="WGS84"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="ba8ac663-b53c-400a-a838-206da20b63d7" id="fb200deb-6383-4e50-b041-9536046ee404" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="35ff6c51-ecdc-419c-9e67-8dbbf4ccaa42" connectedTo="c06f582d-1922-47e3-ae04-a740b28353e3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out_ret"/>
+        <port xsi:type="esdl:InPort" id="fb200deb-6383-4e50-b041-9536046ee404" name="In" connectedTo="ba8ac663-b53c-400a-a838-206da20b63d7" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="35ff6c51-ecdc-419c-9e67-8dbbf4ccaa42" name="Out_ret" connectedTo="c06f582d-1922-47e3-ae04-a740b28353e3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:Joint" name="Joint_526a" id="526a38b8-cf6c-407e-9a76-837d409fdf12">
         <geometry xsi:type="esdl:Point" lat="52.021920019967986" lon="4.4088220596313485"/>
-        <port xsi:type="esdl:InPort" connectedTo="23be2b8d-5f5a-471f-875f-b7e20997f7c5 7ca06d72-bb1d-41ac-9a19-6306fb33e10e" id="027db45e-289d-4611-94ba-95d04abec30f" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="ba8ac663-b53c-400a-a838-206da20b63d7" connectedTo="fb200deb-6383-4e50-b041-9536046ee404" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="027db45e-289d-4611-94ba-95d04abec30f" name="In" connectedTo="23be2b8d-5f5a-471f-875f-b7e20997f7c5 7ca06d72-bb1d-41ac-9a19-6306fb33e10e" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="ba8ac663-b53c-400a-a838-206da20b63d7" name="Out" connectedTo="fb200deb-6383-4e50-b041-9536046ee404" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
       <asset xsi:type="esdl:Pipe" name="Pipe_ates" length="599.3" id="fa07b73b-0ec7-4a6d-bbd5-60b5fdf09d92">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lat="52.021827590527295" lon="4.409401416778565"/>
           <point xsi:type="esdl:Point" lat="52.02648843713918" lon="4.4050025939941415"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="3a52317d-827b-4dc4-a6df-1b145bbb1736" id="3874047c-96e8-4555-902a-8646daf3f984" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="b94d1e9b-5377-4016-9bb3-4452effb5a20" connectedTo="e14c67db-96c3-4fc9-aed2-4fe0f84a34d3" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="3874047c-96e8-4555-902a-8646daf3f984" name="In" connectedTo="3a52317d-827b-4dc4-a6df-1b145bbb1736" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="b94d1e9b-5377-4016-9bb3-4452effb5a20" name="Out" connectedTo="e14c67db-96c3-4fc9-aed2-4fe0f84a34d3" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
       </asset>
       <asset xsi:type="esdl:Pipe" name="Pipe_ates_ret" length="549.0" id="1f1a7ed1-c6fe-4afe-a39c-77803b8aed2f">
         <geometry xsi:type="esdl:Line" CRS="WGS84">
           <point xsi:type="esdl:Point" lat="52.02633000273639" lon="4.404745101928712"/>
           <point xsi:type="esdl:Point" lat="52.02203885753961" lon="4.408714771270753"/>
         </geometry>
-        <port xsi:type="esdl:InPort" connectedTo="07a302f6-4e5b-40ef-87e3-c908a993dfe4" id="9a58c5ba-1ac1-48cb-b583-5c568190ae3c" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In"/>
-        <port xsi:type="esdl:OutPort" id="7ca06d72-bb1d-41ac-9a19-6306fb33e10e" connectedTo="027db45e-289d-4611-94ba-95d04abec30f" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:InPort" id="9a58c5ba-1ac1-48cb-b583-5c568190ae3c" name="In" connectedTo="07a302f6-4e5b-40ef-87e3-c908a993dfe4" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+        <port xsi:type="esdl:OutPort" id="7ca06d72-bb1d-41ac-9a19-6306fb33e10e" name="Out" connectedTo="027db45e-289d-4611-94ba-95d04abec30f" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
-      <asset xsi:type="esdl:ATES" aquiferNetToGross="1.0" name="ATES_4d6d" aquiferThickness="45.0" maxDischargeRate="11610000.0" wellCasingSize="13.0" aquiferAnisotropy="4.0" aquiferPorosity="0.3" aquiferTopDepth="300.0" aquiferMidTemperature="17.0" id="4d6dfb40-ea51-4176-a27e-4ee60cad4034" wellDistance="150.0" maxChargeRate="11610000.0" salinity="10000.0" aquiferPermeability="10000.0">
+      <asset xsi:type="esdl:ATES" aquiferNetToGross="1.0" name="ATES_4d6d" aquiferThickness="45.0" maxDischargeRate="11610000.0" wellCasingSize="31.0" aquiferAnisotropy="4.0" aquiferPorosity="0.3" aquiferTopDepth="300.0" aquiferMidTemperature="17.0" id="4d6dfb40-ea51-4176-a27e-4ee60cad4034" wellDistance="150.0" maxChargeRate="11610000.0" salinity="10000.0" aquiferPermeability="10000.0" maximumFlowRate="300.0">
         <geometry xsi:type="esdl:Point" lat="52.026597360465495" lon="4.404745101928712"/>
         <dataSource xsi:type="esdl:DataSource" description="This data was generated using the 'kosten_per_asset.xslx' file in the 'Kentallen' directory of WarmingUp project 1D" attribution="" name="WarmingUp factsheet: HT-ATES (high)"/>
-        <port xsi:type="esdl:InPort" connectedTo="b94d1e9b-5377-4016-9bb3-4452effb5a20" id="e14c67db-96c3-4fc9-aed2-4fe0f84a34d3" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="In">
+        <port xsi:type="esdl:InPort" id="e14c67db-96c3-4fc9-aed2-4fe0f84a34d3" name="In" connectedTo="b94d1e9b-5377-4016-9bb3-4452effb5a20" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret">
           <profile xsi:type="esdl:InfluxDBProfile" multiplier="5.0" startDate="2018-12-31T23:00:00.000000+0000" filters="" id="1e323c5f-f645-42bf-8631-b63b0a24c424" measurement="WarmingUp default profiles" database="energy_profiles" host="profiles.warmingup.info" port="443" field="demand4_MW" endDate="2019-12-31T22:00:00.000000+0000">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitReference" reference="e9405fc8-5e57-4df5-8584-4babee7cdf1b"/>
           </profile>
         </port>
-        <port xsi:type="esdl:OutPort" id="07a302f6-4e5b-40ef-87e3-c908a993dfe4" connectedTo="9a58c5ba-1ac1-48cb-b583-5c568190ae3c" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Out"/>
+        <port xsi:type="esdl:OutPort" id="07a302f6-4e5b-40ef-87e3-c908a993dfe4" name="Out" connectedTo="9a58c5ba-1ac1-48cb-b583-5c568190ae3c" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
         <costInformation xsi:type="esdl:CostInformation">
           <fixedOperationalCosts xsi:type="esdl:SingleValue" value="30000.0">
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" perTimeUnit="YEAR" id="574ef21d-681a-43ae-a1cb-f7b25d88defb" description="Cost in EUR/yr"/>
@@ -236,8 +236,8 @@
       </asset>
       <asset xsi:type="esdl:GenericProducer" power="100000000.0" name="GenericProducer_0375" id="0375b489-b57b-439d-9ce9-db2dc9d0bbb9">
         <geometry xsi:type="esdl:Point" lon="4.40077438452907" CRS="WGS84" lat="52.0197014548679"/>
-        <port xsi:type="esdl:OutPort" id="7dde77c4-a956-4496-b8b9-e714317cc0f2" connectedTo="30f746ff-aca7-4e55-946e-3dcaf2ac7569" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret" name="Out"/>
-        <port xsi:type="esdl:InPort" connectedTo="095f2c36-395f-4183-a760-80d5362e1de3" id="f8113571-6167-4850-b558-f97f39a0a3f3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="In"/>
+        <port xsi:type="esdl:OutPort" id="7dde77c4-a956-4496-b8b9-e714317cc0f2" name="Out" connectedTo="30f746ff-aca7-4e55-946e-3dcaf2ac7569" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:InPort" id="f8113571-6167-4850-b558-f97f39a0a3f3" name="In" connectedTo="095f2c36-395f-4183-a760-80d5362e1de3" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
       </asset>
     </area>
   </instance>
diff --git a/unit_test/adapters/transforms/esdl_asset_mappers/test_esdl_asset_ates_mapper.py b/unit_test/adapters/transforms/esdl_asset_mappers/test_esdl_asset_ates_mapper.py
index 353ba154..cee0d070 100644
--- a/unit_test/adapters/transforms/esdl_asset_mappers/test_esdl_asset_ates_mapper.py
+++ b/unit_test/adapters/transforms/esdl_asset_mappers/test_esdl_asset_ates_mapper.py
@@ -81,10 +81,6 @@ def test_to_entity_method(self):
         self.assertEqual(
             ates_entity.salinity, esdl_asset.get_property("salinity", ATES_DEFAULTS.salinity)
         )
-        self.assertEqual(
-            ates_entity.well_casing_size,
-            esdl_asset.get_property("wellCasingSize", ATES_DEFAULTS.well_casing_size),
-        )
         self.assertEqual(
             ates_entity.well_distance,
             esdl_asset.get_property("wellDistance", ATES_DEFAULTS.well_distance),
diff --git a/unit_test/entities/controller/test_controller_network.py b/unit_test/entities/controller/test_controller_network.py
index 5907dca7..e77fc15b 100644
--- a/unit_test/entities/controller/test_controller_network.py
+++ b/unit_test/entities/controller/test_controller_network.py
@@ -256,9 +256,13 @@ def test_set_all_storages_discharge_to_max(self):
             {
                 storage1.id: {
                     PROPERTY_HEAT_DEMAND: -20,
+                    PROPERTY_TEMPERATURE_IN: 40,
+                    PROPERTY_TEMPERATURE_OUT: 50,
                 },
                 storage2.id: {
                     PROPERTY_HEAT_DEMAND: -25,
+                    PROPERTY_TEMPERATURE_IN: 40,
+                    PROPERTY_TEMPERATURE_OUT: 50,
                 },
             },
         )
@@ -286,9 +290,13 @@ def test_set_all_storages_charge_to_max(self):
             {
                 storage1.id: {
                     PROPERTY_HEAT_DEMAND: 10,
+                    PROPERTY_TEMPERATURE_IN: 40,
+                    PROPERTY_TEMPERATURE_OUT: 50,
                 },
                 storage2.id: {
                     PROPERTY_HEAT_DEMAND: 15,
+                    PROPERTY_TEMPERATURE_IN: 40,
+                    PROPERTY_TEMPERATURE_OUT: 50,
                 },
             },
         )
diff --git a/unit_test/entities/test_ates_cluster.py b/unit_test/entities/test_ates_cluster.py
index 43bc0698..c8005d8e 100644
--- a/unit_test/entities/test_ates_cluster.py
+++ b/unit_test/entities/test_ates_cluster.py
@@ -41,6 +41,7 @@ def setUp(self) -> None:
         self.salinity = ATES_DEFAULTS.salinity
         self.well_casing_size = ATES_DEFAULTS.well_casing_size
         self.well_distance = ATES_DEFAULTS.well_distance
+        maximum_flowrate = ATES_DEFAULTS.maximum_flowrate
         # Create a production cluster object
         self.ates_cluster = AtesCluster(
             asset_name="ates_cluster",
@@ -54,8 +55,9 @@ def setUp(self) -> None:
             aquifer_permeability=self.aquifer_permeability,
             aquifer_anisotropy=self.aquifer_anisotropy,
             salinity=self.salinity,
-            well_casing_size=self.well_casing_size,
             well_distance=self.well_distance,
+            well_casing_size=self.well_casing_size,
+            maximum_flowrate=maximum_flowrate,
         )
 
     def test_injection_ates(self) -> None: