diff --git a/ci/win32/format.cmd b/ci/win32/format.cmd
index 8a871a77..be50a1ab 100644
--- a/ci/win32/format.cmd
+++ b/ci/win32/format.cmd
@@ -5,5 +5,5 @@ pushd .
 cd /D "%~dp0"
 cd ..\..\
 black ./src/omotes_simulator_core ./unit_test/
-isort --diff ./src/omotes_simulator_core ./unit_test/
+isort ./src/omotes_simulator_core ./unit_test/
 popd
diff --git a/ci/win32/lint.cmd b/ci/win32/lint.cmd
index ed2448a6..d9012829 100644
--- a/ci/win32/lint.cmd
+++ b/ci/win32/lint.cmd
@@ -4,5 +4,5 @@ rem @echo off
 pushd .
 cd /D "%~dp0"
 cd ..\..\
-flake8 .\src\omotes_simulator_core
+flake8 .\src\omotes_simulator_core .\unit_test
 popd
diff --git a/ci/win32/typecheck.cmd b/ci/win32/typecheck.cmd
index c7dd28cb..f54cb465 100644
--- a/ci/win32/typecheck.cmd
+++ b/ci/win32/typecheck.cmd
@@ -4,5 +4,5 @@ cd /D "%~dp0"
 cd ..\..\
 call .\venv\Scripts\activate
 set PYTHONPATH=.\src\;%$PYTHONPATH%
-python -m mypy ./src/
+python -m mypy ./src/omotes_simulator_core ./unit_test/
 popd
\ No newline at end of file
diff --git a/src/omotes_simulator_core/adapter/transforms/controller_mappers/controller_storage_mapper.py b/src/omotes_simulator_core/adapter/transforms/controller_mappers/controller_storage_mapper.py
index d1d0c89f..65ca0b19 100644
--- a/src/omotes_simulator_core/adapter/transforms/controller_mappers/controller_storage_mapper.py
+++ b/src/omotes_simulator_core/adapter/transforms/controller_mappers/controller_storage_mapper.py
@@ -48,8 +48,8 @@ def to_entity(self, esdl_asset: EsdlAssetObject) -> ControllerStorage:
         charge_power = esdl_asset.get_property(
             esdl_property_name="maxChargeRate", default_value=np.inf
         )
-        temperature_in = esdl_asset.get_temperature("In", "Return")
-        temperature_out = esdl_asset.get_temperature("Out", "Supply")
+        temperature_in = esdl_asset.get_temperature("In", "Supply")
+        temperature_out = esdl_asset.get_temperature("Out", "Return")
         profile = pd.DataFrame()  # esdl_asset.get_profile()
         contr_storage = ControllerStorage(
             name=esdl_asset.esdl_asset.name,
diff --git a/src/omotes_simulator_core/adapter/transforms/esdl_asset_mapper.py b/src/omotes_simulator_core/adapter/transforms/esdl_asset_mapper.py
index 4eb29cb3..b984643d 100644
--- a/src/omotes_simulator_core/adapter/transforms/esdl_asset_mapper.py
+++ b/src/omotes_simulator_core/adapter/transforms/esdl_asset_mapper.py
@@ -22,6 +22,9 @@
 from omotes_simulator_core.adapter.transforms.esdl_asset_mappers.consumer_mapper import (
     EsdlAssetConsumerMapper,
 )
+from omotes_simulator_core.adapter.transforms.esdl_asset_mappers.heat_buffer_mapper import (
+    EsdlAssetHeatBufferMapper,
+)
 from omotes_simulator_core.adapter.transforms.esdl_asset_mappers.heat_pump_mapper import (
     EsdlAssetHeatPumpMapper,
 )
@@ -49,6 +52,8 @@
     esdl.Pipe: EsdlAssetPipeMapper,
     esdl.HeatPump: EsdlAssetHeatPumpMapper,
     esdl.ATES: EsdlAssetAtesMapper,
+    esdl.WaterBuffer: EsdlAssetHeatBufferMapper,
+    esdl.HeatStorage: EsdlAssetHeatBufferMapper,
 }
 
 
diff --git a/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/heat_buffer_mapper.py b/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/heat_buffer_mapper.py
new file mode 100644
index 00000000..2dfbfb23
--- /dev/null
+++ b/src/omotes_simulator_core/adapter/transforms/esdl_asset_mappers/heat_buffer_mapper.py
@@ -0,0 +1,46 @@
+#  Copyright (c) 2023. Deltares & TNO
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""Module containing the Esdl to HeatBuffer asset mapper class."""
+
+from omotes_simulator_core.entities.assets.asset_abstract import AssetAbstract
+from omotes_simulator_core.entities.assets.asset_defaults import HEAT_BUFFER_DEFAULTS
+from omotes_simulator_core.entities.assets.esdl_asset_object import EsdlAssetObject
+from omotes_simulator_core.entities.assets.heat_buffer import HeatBuffer
+from omotes_simulator_core.simulation.mappers.mappers import EsdlMapperAbstract
+
+
+class EsdlAssetHeatBufferMapper(EsdlMapperAbstract):
+    """Class to map an ESDL asset to a HeatBuffer entity class."""
+
+    def to_esdl(self, entity: HeatBuffer) -> EsdlAssetObject:
+        """Map a HeatBuffer entity to an EsdlAsset."""
+        raise NotImplementedError("EsdlAssetHeatBufferMapper.to_esdl()")
+
+    def to_entity(self, esdl_asset: EsdlAssetObject) -> AssetAbstract:
+        """Method to map an ESDL asset to a HeatBuffer entity class.
+
+        :param EsdlAssetObject esdl_asset: Object to be converted to a HeatBuffer entity.
+        :return: Ates object.
+        """
+        heat_buffer_entity = HeatBuffer(
+            asset_name=esdl_asset.esdl_asset.name,
+            asset_id=esdl_asset.esdl_asset.id,
+            port_ids=esdl_asset.get_port_ids(),
+            volume=esdl_asset.get_property(
+                esdl_property_name="volume", default_value=HEAT_BUFFER_DEFAULTS.volume
+            ),
+        )
+
+        return heat_buffer_entity
diff --git a/src/omotes_simulator_core/adapter/transforms/string_to_esdl.py b/src/omotes_simulator_core/adapter/transforms/string_to_esdl.py
index d420455f..7b013449 100644
--- a/src/omotes_simulator_core/adapter/transforms/string_to_esdl.py
+++ b/src/omotes_simulator_core/adapter/transforms/string_to_esdl.py
@@ -38,6 +38,8 @@ class StringEsdlAssetMapper:
         esdl.Joint: "joint",
         esdl.ATES: "storage",
         esdl.HeatPump: "pump",
+        esdl.HeatStorage: "storage",
+        esdl.WaterBuffer: "storage",
         esdl.HeatExchange: "heat_exchanger",
     }
 
diff --git a/src/omotes_simulator_core/entities/assets/asset_abstract.py b/src/omotes_simulator_core/entities/assets/asset_abstract.py
index f9ce9ea9..d01a4f45 100644
--- a/src/omotes_simulator_core/entities/assets/asset_abstract.py
+++ b/src/omotes_simulator_core/entities/assets/asset_abstract.py
@@ -16,6 +16,7 @@
 """Abstract class for asset."""
 
 from abc import ABC, abstractmethod
+from datetime import datetime
 
 from pandas import DataFrame, concat
 
@@ -65,6 +66,7 @@ def __init__(self, asset_name: str, asset_id: str, connected_ports: list[str]) -
         self.connected_ports = connected_ports
         self.outputs = [[] for _ in range(len(self.connected_ports))]
         self.time_step: float = 3600  # s
+        self.time = datetime.now()
 
     def __repr__(self) -> str:
         """Method to print string with the name of the asset."""
@@ -146,6 +148,13 @@ def set_time_step(self, time_step: float) -> None:
         """
         self.time_step = time_step
 
+    def set_time(self, time: datetime) -> None:
+        """Placeholder to set the time for the asset.
+
+        :param float time: The time to set for the asset.
+        """
+        self.time = time
+
     def is_converged(self) -> bool:
         """Check if the asset has converged.
 
diff --git a/src/omotes_simulator_core/entities/assets/asset_defaults.py b/src/omotes_simulator_core/entities/assets/asset_defaults.py
index c3accc3e..f10edd46 100644
--- a/src/omotes_simulator_core/entities/assets/asset_defaults.py
+++ b/src/omotes_simulator_core/entities/assets/asset_defaults.py
@@ -71,6 +71,14 @@ class AtesDefaults:
     maximum_flow_discharge: float = 200.0  # m3/h
 
 
+@dataclass
+class HeatBufferDefaults:
+    """Class containing the default values for Heat Buffer."""
+
+    volume: float = 1  # m3
+    fill_level: float = 0.5  # fraction 0-1
+
+
 @dataclass
 class HeatPumpDefaults:
     """Class containing the default values for a heat pump.
@@ -113,6 +121,8 @@ class HeatExchangerDefaults:
 PROPERTY_DIAMETER = "diameter"
 PROPERTY_ROUGHNESS = "roughness"
 PROPERTY_ALPHA_VALUE = "alpha_value"
+PROPERTY_VOLUME = "volume"
+PROPERTY_FILL_LEVEL = "fill_level"
 PROPERTY_PRESSURE_LOSS = "pressure_loss"
 PROPERTY_PRESSURE_LOSS_PER_LENGTH = "pressure_loss_per_length"
 PROPERTY_HEAT_LOSS = "heat_loss"
@@ -125,3 +135,4 @@ class HeatExchangerDefaults:
 # Static members
 PIPE_DEFAULTS = PipeDefaults()
 ATES_DEFAULTS = AtesDefaults()
+HEAT_BUFFER_DEFAULTS = HeatBufferDefaults()
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 cbcca453..c3bdbe80 100644
--- a/src/omotes_simulator_core/entities/assets/controller/controller_storage.py
+++ b/src/omotes_simulator_core/entities/assets/controller/controller_storage.py
@@ -49,6 +49,8 @@ def __init__(
         self.temperature_out = temperature_out
         self.profile: pd.DataFrame = profile
         self.start_index = 0
+
+        # Theoretical maximum charge and discharge power of the storage.
         self.max_charge_power: float = max_charge_power
         self.max_discharge_power: float = max_discharge_power
 
@@ -58,21 +60,28 @@ def get_heat_power(self, time: datetime.datetime) -> float:
         :param datetime.datetime time: Time for which to get the heat demand.
         :return: float with the heat demand.
         """
+        # Check if the selected time is in the profile.
+        # TODO: Current implementation loops over the entire profile; should be improved!
+        # TODO: Unclear why there is a timestep of 1 hour in the profile.
         for index in range(self.start_index, len(self.profile)):
             if abs((self.profile["date"][index].to_pydatetime() - time).total_seconds()) < 3600:
                 self.start_index = index
                 if self.profile["values"][index] > self.max_charge_power:
                     logging.warning(
-                        f"Storage of {self.name} is higher than maximum charge power of asset"
-                        f" at time {time}."
+                        "Storage of %s is higher than maximum charge power of asset at time %s.",
+                        self.name,
+                        time,
                     )
                     return self.max_charge_power
                 elif self.profile["values"][index] < self.max_discharge_power:
                     logging.warning(
-                        f"Storage of {self.name} is higher than maximum discharge power of asset"
-                        f" at time {time}."
+                        "Storage of %s is higher than maximum discharge power of asset at time %s.",
+                        self.name,
+                        time,
                     )
                     return self.max_discharge_power
                 else:
                     return float(self.profile["values"][index])
-        return 0
+        # TODO: The loop is not complete as the asset also has a fill-level that should not
+        #  surpass the maximum fill-level.
+        return 0.0
diff --git a/src/omotes_simulator_core/entities/assets/heat_buffer.py b/src/omotes_simulator_core/entities/assets/heat_buffer.py
new file mode 100644
index 00000000..b6b6be69
--- /dev/null
+++ b/src/omotes_simulator_core/entities/assets/heat_buffer.py
@@ -0,0 +1,250 @@
+#  Copyright (c) 2023. Deltares & TNO
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Heat Buffer class."""
+from cmath import isinf
+from datetime import datetime
+from typing import Dict
+
+import numpy as np
+from scipy.integrate import solve_ivp
+
+from omotes_simulator_core.entities.assets.asset_abstract import AssetAbstract
+from omotes_simulator_core.entities.assets.asset_defaults import (
+    DEFAULT_TEMPERATURE,
+    PROPERTY_HEAT_DEMAND,
+    PROPERTY_MASSFLOW,
+    PROPERTY_PRESSURE_RETURN,
+    PROPERTY_PRESSURE_SUPPLY,
+    PROPERTY_TEMPERATURE_IN,
+    PROPERTY_TEMPERATURE_OUT,
+)
+from omotes_simulator_core.entities.assets.esdl_asset_object import EsdlAssetObject
+from omotes_simulator_core.entities.assets.utils import (
+    heat_demand_and_temperature_to_mass_flow,
+)
+from omotes_simulator_core.solver.network.assets.production_asset import HeatBoundary
+from omotes_simulator_core.solver.utils.fluid_properties import fluid_props
+
+
+class HeatBuffer(AssetAbstract):
+    """A HeatBuffer represents an asset that stores heat. Thus, it has the possibility to supply \
+    heat or consume heat for storage."""
+
+    temperature_supply: float
+    """The supply temperature of the asset [K]."""
+
+    temperature_return: float
+    """The return temperature of the asset [K]."""
+
+    thermal_power_allocation: float
+    """The thermal for injection (positive) or production (negative) by the asset [W]."""
+
+    mass_flowrate: float
+    """The flow rate going in or out by the asset [kg/s]."""
+
+    volume: float
+    """The volume of the heat storage [m3]."""
+
+    energy: float
+    """The stored energy in the storage [Wh]."""
+
+    def __init__(
+        self,
+        asset_name: str,
+        asset_id: str,
+        port_ids: list[str],
+        volume: float,
+    ) -> None:
+        """Initialize a HeatBuffer object.
+
+        :param str asset_name: The name of the asset.
+        :param str asset_id: The unique identifier of the asset.
+        """
+        super().__init__(asset_name=asset_name, asset_id=asset_id, connected_ports=port_ids)
+
+        # Supply and return temperature of the asset [K]
+        self.temperature_in = DEFAULT_TEMPERATURE
+        self.temperature_out = DEFAULT_TEMPERATURE
+
+        # Volume properties of the asset: volume [m3], fill level [fraction 0-1]
+        self.tank_volume = volume
+        self.num_layer = 5
+        self.layer_volume = self.tank_volume / self.num_layer
+        self.density = fluid_props.get_density((self.temperature_in + self.temperature_out) / 2)
+        self.layer_mass = self.layer_volume * self.density
+        self.layer_temperature = np.ones(self.num_layer) * (DEFAULT_TEMPERATURE)
+
+        # Thermal power allocation [W] for injection (positive) or production (negative) by the
+        # asset and mass flowrate [kg/s] going in or out by the asset
+        self.thermal_power_allocation = 0
+        self.mass_flowrate = 0
+        self.solver_asset = HeatBoundary(name=self.name, _id=self.asset_id)
+
+        self.output: list = []
+        self.first_time_step = True
+        self.energy_stored = 0.0
+        self.current_time = datetime.now()
+
+    def set_setpoints(self, setpoints: Dict) -> None:
+        """Placeholder to set the setpoints of an asset prior to a simulation.
+
+        :param Dict setpoints: The setpoints that should be set for the asset.
+        The keys of the dictionary are the names of the setpoints and the values are the values
+        """
+        # don't do any calculation if the time is still the same to avoid storage's state problem
+        if self.current_time == self.time:
+            return
+        self.current_time = self.time
+        # Default keys required
+        necessary_setpoints = {
+            PROPERTY_TEMPERATURE_IN,
+            PROPERTY_TEMPERATURE_OUT,
+            PROPERTY_HEAT_DEMAND,
+        }
+        # Dict to set
+        setpoints_set = set(setpoints.keys())
+        # Check if all setpoints are in the setpoints
+        if necessary_setpoints.issubset(setpoints_set):
+            # negative is charging and positive is discharging
+            self.thermal_power_allocation = -setpoints[PROPERTY_HEAT_DEMAND]
+
+            if self.first_time_step:
+                self.temperature_in = setpoints[PROPERTY_TEMPERATURE_IN]
+                self.temperature_out = setpoints[PROPERTY_TEMPERATURE_OUT]
+                self.first_time_step = False
+            else:
+                # After the first time step: use solver temperature
+                if self.thermal_power_allocation >= 0:
+                    self.temperature_in = setpoints[PROPERTY_TEMPERATURE_IN]
+                    self.temperature_out = self.solver_asset.get_temperature(1)
+                else:
+                    self.temperature_in = self.solver_asset.get_temperature(0)
+                    self.temperature_out = setpoints[PROPERTY_TEMPERATURE_OUT]
+
+            self._calculate_massflowrate()
+            self._calculate_new_temperature()
+            self._set_solver_asset_setpoint()
+        else:
+            # Print missing setpoints
+            raise ValueError(
+                f"The setpoints {necessary_setpoints.difference(setpoints_set)} are missing."
+            )
+
+    def _calculate_massflowrate(self) -> None:
+        """Calculate mass flowrate of the asset."""
+        self.mass_flowrate = heat_demand_and_temperature_to_mass_flow(
+            self.thermal_power_allocation, self.temperature_in, self.temperature_out
+        )
+        if isinf(self.mass_flowrate):
+            self.mass_flowrate = 0
+
+    def _calculate_new_temperature(self) -> None:
+        """Calculate new temperature of the tank storage."""
+
+        def tank_ode_charge(t: float, T: np.ndarray) -> np.ndarray:
+            """ODE 1D tank storage for charging.
+
+            T: array of layer temperatures [°K]
+            Returns: dT/dt for each layer
+            """
+            dTdt = np.zeros_like(T)
+
+            frac = abs(self.mass_flowrate) / (self.density * self.layer_volume)
+
+            # --- Layer 0 (top layer) mixes with inlet flow ---
+            dTdt[0] = frac * (self.temperature_in - T[0])
+
+            # --- Remaining layers: plug-flow approximation ---
+            for i in range(1, self.num_layer):
+                dTdt[i] = frac * (T[i - 1] - T[i])
+            return dTdt
+
+        def tank_ode_discharge(t: float, T: np.ndarray) -> np.ndarray:
+            """ODE 1D tank storage for discharging.
+
+            T: array of layer temperatures [°K]
+            Returns: dT/dt for each layer
+            """
+            dTdt = np.zeros_like(T)
+
+            frac = abs(self.mass_flowrate) / (self.density * self.layer_volume)
+
+            # --- Layer -1 (bottom layer) mixes with inlet flow ---
+            dTdt[-1] = frac * (self.temperature_out - T[-1])
+
+            # --- Remaining layers: plug-flow approximation ---
+            for i in reversed(range(0, self.num_layer - 1)):
+                dTdt[i] = frac * (T[i + 1] - T[i])
+            return dTdt
+
+        if self.mass_flowrate >= 0:
+
+            sol = solve_ivp(
+                tank_ode_charge, (0, self.time_step), self.layer_temperature, method="RK45"
+            )
+            for i in range(self.num_layer):
+                self.layer_temperature[i] = sol.y[i][-1]
+
+            self.temperature_out = float(self.layer_temperature[-1])
+
+        else:
+            sol = solve_ivp(
+                tank_ode_discharge, (0, self.time_step), self.layer_temperature, method="RK45"
+            )
+            for i in range(self.num_layer):
+                self.layer_temperature[i] = sol.y[i][-1]
+
+            self.temperature_in = float(self.layer_temperature[0])
+
+        self.energy_stored = (
+            self.energy_stored
+            + self.mass_flowrate
+            * self.time_step
+            / 3600
+            * 4180
+            * (self.temperature_in - self.temperature_out)
+        )
+
+    def _set_solver_asset_setpoint(self) -> None:
+        """Set the setpoint of solver asset."""
+        if self.mass_flowrate >= 0:
+            self.solver_asset.supply_temperature = self.temperature_out
+        else:
+            self.solver_asset.supply_temperature = self.temperature_in
+
+        self.solver_asset.mass_flow_rate_set_point = self.mass_flowrate  # type: ignore
+
+    def add_physical_data(self, esdl_asset: EsdlAssetObject) -> None:
+        """Method to add physical data to the asset.
+
+        :param EsdlAssetObject esdl_asset: The esdl asset object to add the physical data from.
+         :return:
+        """
+
+    def write_to_output(self) -> None:
+        """Placeholder to write the asset to the output.
+
+        The output list is a list of dictionaries, where each dictionary
+        represents the output of its asset for a specific timestep.
+        """
+        output_dict = {
+            PROPERTY_MASSFLOW: self.solver_asset.get_mass_flow_rate(1),
+            PROPERTY_PRESSURE_SUPPLY: self.solver_asset.get_pressure(0),
+            PROPERTY_PRESSURE_RETURN: self.solver_asset.get_pressure(1),
+            PROPERTY_TEMPERATURE_IN: self.solver_asset.get_temperature(0),
+            PROPERTY_TEMPERATURE_OUT: self.solver_asset.get_temperature(1),
+        }
+        self.output.append(output_dict)
diff --git a/src/omotes_simulator_core/entities/heat_network.py b/src/omotes_simulator_core/entities/heat_network.py
index bf9130fe..886c431a 100644
--- a/src/omotes_simulator_core/entities/heat_network.py
+++ b/src/omotes_simulator_core/entities/heat_network.py
@@ -55,6 +55,7 @@ def run_time_step(
         for py_asset in self.assets:
             if py_asset.asset_id in controller_input:
                 py_asset.set_time_step(time_step)
+                py_asset.set_time(time)
                 py_asset.set_setpoints(controller_input[py_asset.asset_id])
 
         self.solver.solve()
diff --git a/src/omotes_simulator_core/entities/network_controller.py b/src/omotes_simulator_core/entities/network_controller.py
index 0ebda582..ac9563de 100644
--- a/src/omotes_simulator_core/entities/network_controller.py
+++ b/src/omotes_simulator_core/entities/network_controller.py
@@ -182,7 +182,6 @@ def get_total_discharge_storage(self) -> float:
 
         :return float: Total heat discharge of all storages.
         """
-        # TODO add limit based on state of charge
         return float(sum([storage.max_discharge_power for storage in self.storages]))
 
     def get_total_charge_storage(self) -> float:
diff --git a/testdata/test_heat_buffer.esdl b/testdata/test_heat_buffer.esdl
new file mode 100644
index 00000000..924bb26a
--- /dev/null
+++ b/testdata/test_heat_buffer.esdl
@@ -0,0 +1,225 @@
+<?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="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"/>
+      <carrier xsi:type="esdl:HeatCommodity" returnTemperature="40.0" id="bac202fe-7c5f-4623-8ade-badbc607a16e_ret" name="Return_ret" supplyTemperature="80.0"/>
+    </carriers>
+    <quantityAndUnits xsi:type="esdl:QuantityAndUnits" id="54fda8fc-e725-4c44-8a49-726a811ba069">
+      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="eb07bccb-203f-407e-af98-e687656a221d" description="Energy in GJ" multiplier="GIGA" physicalQuantity="ENERGY" unit="JOULE"/>
+      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="e9405fc8-5e57-4df5-8584-4babee7cdf1b" description="Power in MW" multiplier="MEGA" physicalQuantity="POWER" unit="WATT"/>
+      <quantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="e9405fc8-5e57-4df5-8584-4babee7cdf1a" description="Power in kW" multiplier="KILO" physicalQuantity="POWER" unit="WATT"/>
+    </quantityAndUnits>
+  </energySystemInformation>
+  <instance xsi:type="esdl:Instance" id="8db3337e-440e-48d1-b1e9-6f86c4f76320" name="Untitled instance">
+    <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" 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" 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" 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" 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" 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" 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" 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" diameter="DN80" 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" 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" diameter="DN200" 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" 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" 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" diameter="DN100" 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"/>
+          <point xsi:type="esdl:Point" lat="52.02034869350056" lon="4.4269752502441415"/>
+          <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" 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" diameter="DN100" 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"/>
+          <point xsi:type="esdl:Point" lat="52.033379790423076" lon="4.416353702545167"/>
+          <point xsi:type="esdl:Point" lat="52.035940674013524" lon="4.408607482910157"/>
+          <point xsi:type="esdl:Point" lat="52.03683826859462" lon="4.405066967010499"/>
+          <point xsi:type="esdl:Point" lat="52.03810543026395" lon="4.400925636291505"/>
+          <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" 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" 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" 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" diameter="DN80" 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" 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" diameter="DN200" 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" 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" diameter="DN100" 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"/>
+          <point xsi:type="esdl:Point" lon="4.426279962182911" lat="52.020438693590556" CRS="WGS84"/>
+          <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" 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" diameter="DN100" 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"/>
+          <point xsi:type="esdl:Point" lon="4.400290793359585" lat="52.038195430353944" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.404428167491401" lat="52.03692826868462" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.407965850141681" lat="52.03603067410352" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.41570384355307" lat="52.033469790513074" CRS="WGS84"/>
+          <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" 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" diameter="DN150" name="Pipe5_a" innerDiameter="0.15" length="625.29" id="2b5ba02c-bbfe-4bb9-9e4e-48c4c45c53e9" outerDiameter="0.16">
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lat="52.01909093233181" lon="4.401419162750245"/>
+          <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" 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" diameter="DN150" name="Pipe5_b" innerDiameter="0.15" length="999.47" id="0f7eed4a-ac9a-4f38-9825-876e41e8c100" outerDiameter="0.16">
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lat="52.021827590527295" lon="4.409401416778565"/>
+          <point xsi:type="esdl:Point" lat="52.0233064386584" lon="4.414680004119874"/>
+          <point xsi:type="esdl:Point" lat="52.025085613014795" lon="4.419805705547334"/>
+          <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" 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" 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" diameter="DN150" name="Pipe5_ret_a" innerDiameter="0.1" length="993.35" id="3a1d7c9a-18cd-4360-ae7f-74062a514317" outerDiameter="0.16">
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lat="52.02587372990452" lon="4.421796245126029"/>
+          <point xsi:type="esdl:Point" lon="4.420918767262569" lat="52.025761503825485" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.419127661327588" lat="52.02517561310479" CRS="WGS84"/>
+          <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" 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" diameter="DN150" name="Pipe5_ret_b" innerDiameter="0.1" length="632.79" id="92af5656-dbd3-4ddf-abaa-9ef47ea96333" outerDiameter="0.16">
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lat="52.021920019967986" lon="4.4088220596313485"/>
+          <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" 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" 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" diameter="DN150" 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" 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="58fa3db6-c1e6-4c8c-b540-1e17985b79d5" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" diameter="DN150" 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" id="9a58c5ba-1ac1-48cb-b583-5c568190ae3c" name="In" connectedTo="93f83b88-bb0b-4a83-bad7-713530347380" 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: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" 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>
+      <asset xsi:type="esdl:HeatStorage" id="7ce0ddec-890b-4abb-99d8-2fd6666d02f6" name="HeatStorage_7ce0" maxChargeRate="1000000.0" maxDischargeRate="1000000.0" volume="50.0">
+        <geometry xsi:type="esdl:Point" lat="52.026718233499246" lon="4.4045103755280754" CRS="WGS84"/>
+        <port xsi:type="esdl:InPort" id="58fa3db6-c1e6-4c8c-b540-1e17985b79d5" name="In" connectedTo="b94d1e9b-5377-4016-9bb3-4452effb5a20" carrier="e96c4852-b2bc-43be-8fa7-5ae5e25a1883_ret"/>
+        <port xsi:type="esdl:OutPort" id="93f83b88-bb0b-4a83-bad7-713530347380" name="Out" connectedTo="9a58c5ba-1ac1-48cb-b583-5c568190ae3c" carrier="bac202fe-7c5f-4623-8ade-badbc607a16e_ret"/>
+      </asset>
+    </area>
+  </instance>
+</esdl:EnergySystem>
diff --git a/unit_test/adapters/transforms/controller_mappers/test_controller_storage_mapper.py b/unit_test/adapters/transforms/controller_mappers/test_controller_storage_mapper.py
index e78f2be6..92c4db5d 100644
--- a/unit_test/adapters/transforms/controller_mappers/test_controller_storage_mapper.py
+++ b/unit_test/adapters/transforms/controller_mappers/test_controller_storage_mapper.py
@@ -47,7 +47,7 @@ def test_to_entity_method(self):
         controller_storage = self.mapper.to_entity(storage_assets[0])
 
         # Assert
-        self.assertEqual(controller_storage.temperature_out, 353.15)
-        self.assertEqual(controller_storage.temperature_in, 313.15)
+        self.assertEqual(controller_storage.temperature_in, 353.15)
+        self.assertEqual(controller_storage.temperature_out, 313.15)
         self.assertEqual(controller_storage.max_charge_power, 11.61e6)
         self.assertEqual(controller_storage.max_discharge_power, 11.61e6)
diff --git a/unit_test/entities/test_heat_buffer.py b/unit_test/entities/test_heat_buffer.py
new file mode 100644
index 00000000..5e1fa1d2
--- /dev/null
+++ b/unit_test/entities/test_heat_buffer.py
@@ -0,0 +1,85 @@
+#  Copyright (c) 2023. Deltares & TNO
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Test Heat Buffer entities."""
+import unittest
+from datetime import datetime
+
+import numpy as np
+
+from omotes_simulator_core.entities.assets.asset_defaults import (
+    PROPERTY_HEAT_DEMAND,
+    PROPERTY_TEMPERATURE_IN,
+    PROPERTY_TEMPERATURE_OUT,
+)
+from omotes_simulator_core.entities.assets.heat_buffer import HeatBuffer
+
+
+class HeatBufferTest(unittest.TestCase):
+    """Testcase for HeatBuffer class."""
+
+    def setUp(self) -> None:
+        """Set up before each test case."""
+        # Create a production cluster object
+        self.heat_buffer = HeatBuffer(
+            asset_name="heat_buffer",
+            asset_id="heat_buffer_id",
+            port_ids=["test1", "test2"],
+            volume=1,
+        )
+
+    def test_injection(self) -> None:
+        """Test injection to Heat Buffer."""
+        # Arrange
+        setpoints = {
+            PROPERTY_HEAT_DEMAND: 5e3,
+            PROPERTY_TEMPERATURE_IN: 85 + 273.15,
+            PROPERTY_TEMPERATURE_OUT: 25 + 273.15,
+        }
+
+        # Act
+        # charging for 1 day
+        for _ii in range(0, 24):
+            self.heat_buffer.first_time_step = True
+            self.heat_buffer.set_time(datetime(2023, 1, 1, _ii, 0, 0))
+            self.heat_buffer.set_setpoints(setpoints=setpoints)
+
+        # Assert
+        self.assertAlmostEqual(self.heat_buffer.layer_temperature[0], 358.14, delta=0.1)
+        self.assertAlmostEqual(self.heat_buffer.layer_temperature[-1], 354.16, delta=0.1)
+
+    def test_production(self) -> None:
+        """Test production from Heat Buffer."""
+        # Arrange
+        setpoints = {
+            PROPERTY_HEAT_DEMAND: -5e3,
+            PROPERTY_TEMPERATURE_IN: 85 + 273.15,
+            PROPERTY_TEMPERATURE_OUT: 25 + 273.15,
+        }
+
+        self.heat_buffer.layer_temperature = np.array(
+            [358.14869781, 358.13745031, 358.08685218, 357.92903466, 357.54565629]
+        )
+
+        # Act
+        # discharging for 1 day
+        for _ii in range(0, 24):
+            self.heat_buffer.first_time_step = True
+            self.heat_buffer.set_time(datetime(2023, 1, 1, _ii, 0, 0))
+            self.heat_buffer.set_setpoints(setpoints=setpoints)
+
+        # Assert
+        self.assertAlmostEqual(self.heat_buffer.layer_temperature[0], 302.23, delta=0.1)
+        self.assertAlmostEqual(self.heat_buffer.layer_temperature[-1], 298.16, delta=0.1)