diff --git a/src/mesido/base_component_type_mixin.py b/src/mesido/base_component_type_mixin.py
index c5d2f7c30..9b77c483e 100644
--- a/src/mesido/base_component_type_mixin.py
+++ b/src/mesido/base_component_type_mixin.py
@@ -20,6 +20,14 @@ def energy_system_components(self) -> Dict[str, str]:
         """
         raise NotImplementedError
 
+    @property
+    @abstractmethod
+    def energy_system_owners(self) -> Dict[str, str]:
+        """
+        This method return a dict with the components structured by owner.
+        """
+        raise NotImplementedError
+
     def energy_system_components_get(self, list_types: list) -> list:
         components = []
         for component_type in list_types:
diff --git a/src/mesido/component_type_mixin.py b/src/mesido/component_type_mixin.py
index 8c0d2a3ec..783be8df7 100644
--- a/src/mesido/component_type_mixin.py
+++ b/src/mesido/component_type_mixin.py
@@ -23,6 +23,7 @@ class ModelicaComponentTypeMixin(BaseComponentTypeMixin):
     def __init__(self, *args, **kwargs):
         super().__init__(**kwargs)
         self.__hn_component_types = None
+        self.__owners = None
 
     def pre(self):
         """
@@ -347,7 +348,13 @@ def energy_system_components(self) -> Dict[str, Set[str]]:
 
             # Find the components in model, detection by string
             # (name.component_type: type)
-            component_types = sorted({v for k, v in string_parameters.items()})
+            component_types = sorted(
+                {
+                    v
+                    for k, v in string_parameters.items()
+                    if ("component_type" in k or "component_subtype" in k)
+                }
+            )
 
             components = {}
             for c in component_types:
@@ -359,6 +366,28 @@ def energy_system_components(self) -> Dict[str, Set[str]]:
 
         return self.__hn_component_types
 
+    @property
+    def energy_system_owners(self):
+        if self.__owners is None:
+            # Create the dictionary once after that it will be available
+            string_parameters = self.string_parameters(0)
+
+            # Find the components in model, detection by string
+            # (name.component_type: type)
+            owners = sorted({v for k, v in string_parameters.items() if "owner" in k})
+
+            ownership_dict = {}
+            for c in owners:
+                ownership_dict[c] = sorted(
+                    {k.split(".")[0] for k, v in string_parameters.items() if v == c}
+                )
+
+            ownership_dict.pop("__", None)
+
+            self.__owners = ownership_dict
+
+        return self.__owners
+
     @property
     def energy_system_topology(self) -> Topology:
         """
diff --git a/src/mesido/esdl/esdl_heat_model.py b/src/mesido/esdl/esdl_heat_model.py
index 6306fe60d..b26218327 100644
--- a/src/mesido/esdl/esdl_heat_model.py
+++ b/src/mesido/esdl/esdl_heat_model.py
@@ -101,6 +101,100 @@ def _rho_cp_modifiers(self) -> Dict:
         """
         return dict(rho=self.rho, cp=self.cp)
 
+    def merge_modifiers(self, a: dict, b: dict):
+        """
+        Recursive (not in place) merge of dictionaries.
+
+        :param a: Base dictionary to merge.
+        :param b: Dictionary to merge on top of base dictionary.
+        :return: Merged dictionary
+        """
+        b = b.copy()
+
+        for k, v in a.items():
+            if isinstance(v, dict):
+                b_node = b.setdefault(k, {})
+                b[k] = self.merge_modifiers(v, b_node)
+            else:
+                if k not in b:
+                    b[k] = v
+
+        return b
+
+    def get_owner(self, asset):
+        return dict(
+            owner=(
+                asset.attributes["isOwnedBy"].name
+                if asset.attributes["isOwnedBy"] is not None
+                else "NoOwner"
+            )
+        )
+
+    def get_carrier_id(self, asset, n=0):
+        if (
+            asset.in_ports is not None
+            and asset.out_ports is not None
+            and len(asset.in_ports) >= 2
+            and len(asset.out_ports) >= 2
+        ):  # heat pump and heat exchanger
+            carrier = asset.global_properties["carriers"][asset.in_ports[0].carrier.id]
+            if "Prim" in asset.in_ports[0].name:
+                prim_in_id = carrier["id_number_mapping"]
+            else:
+                sec_in_id = carrier["id_number_mapping"]
+            carrier = asset.global_properties["carriers"][asset.in_ports[1].carrier.id]
+            if "Prim" in asset.in_ports[1].name:
+                prim_in_id = carrier["id_number_mapping"]
+            else:
+                sec_in_id = carrier["id_number_mapping"]
+            if len(asset.in_ports) == 3:
+                if "Prim" in asset.in_ports[1].name:
+                    prim_in_id = carrier["id_number_mapping"]
+                else:
+                    sec_in_id = carrier["id_number_mapping"]
+            carrier = asset.global_properties["carriers"][asset.out_ports[0].carrier.id]
+            if "Prim" in asset.out_ports[0].name:
+                prim_out_id = carrier["id_number_mapping"]
+            else:
+                sec_out_id = carrier["id_number_mapping"]
+            carrier = asset.global_properties["carriers"][asset.out_ports[1].carrier.id]
+            if "Prim" in asset.out_ports[1].name:
+                prim_out_id = carrier["id_number_mapping"]
+            else:
+                sec_out_id = carrier["id_number_mapping"]
+            ids = dict(
+                Primary=dict(
+                    HeatIn=dict(carrier_id=prim_in_id), HeatOut=dict(carrier_id=prim_out_id)
+                ),
+                Secondary=dict(
+                    HeatIn=dict(carrier_id=sec_in_id), HeatOut=dict(carrier_id=sec_out_id)
+                ),
+            )
+            return ids
+        else:
+            ids = dict()
+            try:
+                carrier = asset.global_properties["carriers"][asset.in_ports[0].carrier.id]
+                id_number = carrier["id_number_mapping"]
+                port = f"{carrier['type'].capitalize()}In"
+                ids[port] = dict(carrier_id=id_number)
+                carrier = asset.global_properties["carriers"][asset.out_ports[0].carrier.id]
+                id_number = carrier["id_number_mapping"]
+                port = f"{carrier['type'].capitalize()}Out"
+                ids[port] = dict(carrier_id=id_number)
+            except KeyError:
+                try:
+                    carrier = asset.global_properties["carriers"][asset.in_ports[0].carrier.id]
+                    id_number = carrier["id_number_mapping"]
+                    port = f"{carrier['type'].capitalize()}In"
+                    ids[port] = dict(carrier_id=id_number)
+                except KeyError:
+                    carrier = asset.global_properties["carriers"][asset.out_ports[0].carrier.id]
+                    id_number = carrier["id_number_mapping"]
+                    port = f"{carrier['type'].capitalize()}Out"
+                    ids[port] = dict(carrier_id=id_number)
+            return ids
+
     def get_asset_attribute_value(
         self,
         asset: Asset,
@@ -309,7 +403,9 @@ def convert_heat_buffer(self, asset: Asset) -> Tuple[Type[HeatBuffer], MODIFIERS
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return HeatBuffer, modifiers
 
@@ -371,7 +467,9 @@ def convert_heat_demand(self, asset: Asset) -> Tuple[Type[HeatDemand], MODIFIERS
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return HeatDemand, modifiers
 
@@ -444,7 +542,9 @@ def convert_cold_demand(self, asset: Asset) -> Tuple[Type[ColdDemand], MODIFIERS
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return ColdDemand, modifiers
 
@@ -507,9 +607,16 @@ def convert_node(self, asset: Asset) -> Tuple[Type[Node], MODIFIERS]:
             if isinstance(x, esdl.esdl.OutPort):
                 sum_out += len(x.connectedTo)
 
+        try:
+            carrier = asset.global_properties["carriers"][asset.in_ports[0].carrier.id]
+        except KeyError:
+            carrier = asset.global_properties["carriers"][asset.out_ports[0].carrier.id]
+
         modifiers = dict(
             n=sum_in + sum_out,
             state=self.get_state(asset),
+            carrier_id=carrier["id_number_mapping"],
+            **self.get_owner(asset),
         )
 
         if isinstance(asset.in_ports[0].carrier, esdl.esdl.GasCommodity) or isinstance(
@@ -613,7 +720,9 @@ def convert_heat_pipe(
                 GasOut=bounds_nominals,
                 state=self.get_state(asset),
                 **self._get_cost_figure_modifiers(asset),
+                **self.get_owner(asset),
             )
+            modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
             return GasPipe, modifiers
 
@@ -669,10 +778,13 @@ def convert_heat_pipe(
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
         if "T_ground" in asset.attributes.keys():
             modifiers["T_ground"] = asset.attributes["T_ground"]
 
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
+
         return HeatPipe, modifiers
 
     def convert_pump(self, asset: Asset) -> Tuple[Type[Pump], MODIFIERS]:
@@ -736,7 +848,9 @@ def convert_pump(self, asset: Asset) -> Tuple[Type[Pump], MODIFIERS]:
             state=self.get_state(asset),
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return Pump, modifiers
 
@@ -891,7 +1005,9 @@ def convert_heat_exchanger(self, asset: Asset) -> Tuple[Type[HeatExchanger], MOD
             state=self.get_state(asset),
             **self._get_cost_figure_modifiers(asset),
             **params,
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
         return HeatExchanger, modifiers
 
     def convert_heat_pump(
@@ -1005,7 +1121,9 @@ def convert_heat_pump(
             state=self.get_state(asset),
             **self._get_cost_figure_modifiers(asset),
             **params,
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
         if len(asset.in_ports) == 2:
             return HeatPump, modifiers
         elif len(asset.in_ports) == 3:
@@ -1099,7 +1217,9 @@ def convert_heat_source(self, asset: Asset) -> Tuple[Type[HeatSource], MODIFIERS
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         if asset.asset_type == "GeothermalSource":
             modifiers["nr_of_doublets"] = asset.attributes["aggregationCount"]
@@ -1235,7 +1355,9 @@ def convert_ates(self, asset: Asset) -> Tuple[Type[ATES], MODIFIERS]:
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         # if no maxStorageTemperature is specified we assume a "regular" HT ATES model
         if (
@@ -1339,7 +1461,9 @@ def convert_control_valve(self, asset: Asset) -> Tuple[Type[ControlValve], MODIF
             state=self.get_state(asset),
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return ControlValve, modifiers
 
@@ -1394,7 +1518,9 @@ def convert_check_valve(self, asset: Asset) -> Tuple[Type[CheckValve], MODIFIERS
             HeatOut=dict(Hydraulic_power=dict(nominal=q_nominal * 16.0e5)),
             **self._supply_return_temperature_modifiers(asset),
             **self._rho_cp_modifiers,
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return CheckValve, modifiers
 
@@ -1458,7 +1584,9 @@ def convert_electricity_demand(self, asset: Asset) -> Tuple[Type[ElectricityDema
                 V=dict(min=min_voltage, nominal=min_voltage),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return ElectricityDemand, modifiers
 
@@ -1552,7 +1680,9 @@ def convert_electricity_source(self, asset: Asset) -> Tuple[Type[ElectricitySour
                 Power=dict(min=0.0, max=max_supply, nominal=max_supply / 2.0),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         if asset.asset_type in ["ElectricityProducer", "Import"]:
             return ElectricitySource, modifiers
@@ -1603,7 +1733,9 @@ def convert_electricity_storage(
                 min=-max_discharge, max=max_charge, nominal=max_charge / 2.0
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return ElectricityStorage, modifiers
 
@@ -1665,7 +1797,17 @@ def convert_electricity_node(self, asset: Asset) -> Tuple[Type[ElectricityNode],
             if isinstance(x, esdl.esdl.OutPort):
                 sum_out += len(x.connectedTo)
 
-        modifiers = dict(voltage_nominal=nominal_voltage, n=sum_in + sum_out)
+        try:
+            carrier = asset.global_properties["carriers"][asset.in_ports[0].carrier.id]
+        except KeyError:
+            carrier = asset.global_properties["carriers"][asset.out_ports[0].carrier.id]
+
+        modifiers = dict(
+            voltage_nominal=nominal_voltage,
+            carrier_id=carrier["id_number_mapping"],
+            n=sum_in + sum_out,
+            **self.get_owner(asset),
+        )
 
         return ElectricityNode, modifiers
 
@@ -1734,7 +1876,9 @@ def convert_electricity_cable(self, asset: Asset) -> Tuple[Type[ElectricityCable
                 Power=dict(min=-max_power, max=max_power, nominal=max_power / 2.0),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
         return ElectricityCable, modifiers
 
     def convert_transformer(self, asset: Asset) -> Tuple[Type[Transformer], MODIFIERS]:
@@ -1848,7 +1992,9 @@ def convert_gas_demand(self, asset: Asset) -> Tuple[Type[GasDemand], MODIFIERS]:
                 Hydraulic_power=dict(min=0.0, max=0.0, nominal=q_nominal * pressure),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return GasDemand, modifiers
 
@@ -1917,7 +2063,9 @@ def convert_gas_source(self, asset: Asset) -> Tuple[Type[GasSource], MODIFIERS]:
                 Hydraulic_power=dict(nominal=q_nominal * pressure),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return GasSource, modifiers
 
@@ -2025,7 +2173,9 @@ def equations(x):
                 V=dict(min=v_min, nominal=v_min),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return Electrolyzer, modifiers
 
@@ -2092,7 +2242,9 @@ def convert_gas_tank_storage(self, asset: Asset) -> Tuple[Type[GasTankStorage],
                 Hydraulic_power=dict(nominal=q_nominal * pressure),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return GasTankStorage, modifiers
 
@@ -2158,7 +2310,9 @@ def convert_gas_substation(self, asset: Asset) -> Tuple[Type[GasSubstation], MOD
                 Hydraulic_power=dict(nominal=q_nom_out * pressure_out),
             ),
             **self._get_cost_figure_modifiers(asset),
+            **self.get_owner(asset),
         )
+        modifiers = self.merge_modifiers(modifiers, self.get_carrier_id(asset))
 
         return GasSubstation, modifiers
 
diff --git a/src/mesido/esdl/esdl_mixin.py b/src/mesido/esdl/esdl_mixin.py
index f6caf85c0..b43a1b282 100644
--- a/src/mesido/esdl/esdl_mixin.py
+++ b/src/mesido/esdl/esdl_mixin.py
@@ -148,10 +148,15 @@ def __init__(self, *args, **kwargs) -> None:
         self._override_gas_pipe_classes = dict()
         self.override_gas_pipe_classes()
 
+        self.__connections = self.__model.get_connections()
+
         self.name_to_esdl_id_map = dict()
 
         super().__init__(*args, **kwargs)
 
+    def get_connections(self):
+        return self.__connections
+
     @property
     def esdl_bytes_string(self) -> bytes:
         """
diff --git a/src/mesido/esdl/esdl_model_base.py b/src/mesido/esdl/esdl_model_base.py
index 3b6e655bc..b4be501c1 100644
--- a/src/mesido/esdl/esdl_model_base.py
+++ b/src/mesido/esdl/esdl_model_base.py
@@ -24,6 +24,7 @@ class _ESDLModelBase(_Model):
 
     primary_port_name_convention = "prim"
     secondary_port_name_convention = "sec"
+    __connections = None
 
     def _esdl_convert(
         self, converter: _AssetToComponentBase, assets: Dict, name_to_id_map: Dict, prefix: str
@@ -320,6 +321,7 @@ def _esdl_convert(
         # therefore do the nodes first, and do all remaining connections
         # after.
         connections = set()
+        model_connections = []
 
         for asset in [*node_assets, *bus_assets, *gas_node_assets]:
             component = getattr(self, asset.name)
@@ -353,6 +355,12 @@ def _esdl_convert(
                             == "Pipe"
                         ):
                             self.connect(getattr(component, node_suf)[i], port_map[connected_to.id])
+                            model_connections.append(
+                                [
+                                    getattr(component, node_suf)[i].name,
+                                    port_map[connected_to.id].name,
+                                ]
+                            )
                         elif connected_to.id not in list(port_map.keys()):
                             # If The asset is not in the
                             # port map means that there is a direct node to node connection with a
@@ -374,12 +382,23 @@ def _esdl_convert(
                                 getattr(component, node_suf)[i],
                                 getattr(getattr(self, connected_node_asset.name), node_suf)[idx],
                             )
+                            model_connections.append(
+                                [
+                                    getattr(component, node_suf)[i],
+                                    getattr(getattr(self, connected_node_asset.name), node_suf)[
+                                        idx
+                                    ],
+                                ]
+                            )
                         else:
                             # If the Connected asset is not of type pipe, there might be
                             # logical link like source to node.
                             self.connect_logical_links(
                                 getattr(component, node_suf)[i], port_map[connected_to.id]
                             )
+                            model_connections.append(
+                                [getattr(component, node_suf)[i], port_map[connected_to.id]]
+                            )
                         connections.add(conn)
                         i += 1
                     elif isinstance(port.carrier, esdl.ElectricityCommodity):
@@ -394,6 +413,9 @@ def _esdl_convert(
                             self.connect(
                                 getattr(component, elec_node_suf)[i], port_map[connected_to.id]
                             )
+                            model_connections.append(
+                                [getattr(component, elec_node_suf)[i], port_map[connected_to.id]]
+                            )
                         elif connected_to.id not in list(port_map.keys()):
                             for node in bus_assets:
                                 if connected_to.id in [node.in_ports[0].id, node.out_ports[0].id]:
@@ -413,11 +435,22 @@ def _esdl_convert(
                                     idx
                                 ],
                             )
+                            model_connections.append(
+                                [
+                                    getattr(component, elec_node_suf)[i],
+                                    getattr(
+                                        getattr(self, connected_node_asset.name), elec_node_suf
+                                    )[idx],
+                                ]
+                            )
                         else:
                             self.connect_logical_links(
                                 getattr(component, elec_node_suf)[i],
                                 port_map[connected_to.id],
                             )
+                            model_connections.append(
+                                [getattr(component, elec_node_suf)[i], port_map[connected_to.id]]
+                            )
                         connections.add(conn)
                         i += 1
                     elif isinstance(port.carrier, esdl.GasCommodity):
@@ -432,6 +465,9 @@ def _esdl_convert(
                             self.connect(
                                 getattr(component, gas_node_suf)[i], port_map[connected_to.id]
                             )
+                            model_connections.append(
+                                [getattr(component, gas_node_suf)[i], port_map[connected_to.id]]
+                            )
                         elif connected_to.id not in list(port_map.keys()):
                             for node in gas_node_assets:
                                 if connected_to.id in [node.in_ports[0].id, node.out_ports[0].id]:
@@ -451,10 +487,21 @@ def _esdl_convert(
                                     idx
                                 ],
                             )
+                            model_connections.append(
+                                [
+                                    getattr(component, gas_node_suf)[i],
+                                    getattr(getattr(self, connected_node_asset.name), gas_node_suf)[
+                                        idx
+                                    ],
+                                ]
+                            )
                         else:
                             self.connect_logical_links(
                                 getattr(component, gas_node_suf)[i], port_map[connected_to.id]
                             )
+                            model_connections.append(
+                                [getattr(component, gas_node_suf)[i], port_map[connected_to.id]]
+                            )
                         connections.add(conn)
                         i += 1
                     else:
@@ -508,4 +555,12 @@ def _esdl_convert(
                         self.connect(port_map[port.id], port_map[connected_to.id])
                     else:
                         self.connect_logical_links(port_map[port.id], port_map[connected_to.id])
+                    model_connections.append(
+                        [port_map[port.id].name, port_map[connected_to.id].name]
+                    )
                     connections.add(conn)
+
+        self.__connections = model_connections
+
+    def get_connections(self):
+        return self.__connections
diff --git a/src/mesido/esdl/esdl_parser.py b/src/mesido/esdl/esdl_parser.py
index 1a1707ee9..d19234af4 100644
--- a/src/mesido/esdl/esdl_parser.py
+++ b/src/mesido/esdl/esdl_parser.py
@@ -56,7 +56,7 @@ def read_esdl(self) -> None:
                     id=x.id,
                     id_number_mapping=id_to_idnumber_map[x.id],
                     temperature=temperature,
-                    type="milp",
+                    type="heat",
                 )
             elif isinstance(x, esdl.esdl.ElectricityCommodity):
                 if x.id not in id_to_idnumber_map:
diff --git a/src/mesido/financial_mixin.py b/src/mesido/financial_mixin.py
index 81a4cc155..ee64074b6 100644
--- a/src/mesido/financial_mixin.py
+++ b/src/mesido/financial_mixin.py
@@ -4,6 +4,7 @@
 import casadi as ca
 
 from mesido.base_component_type_mixin import BaseComponentTypeMixin
+from mesido.heat_network_common import NodeConnectionDirection
 
 import numpy as np
 
@@ -77,6 +78,7 @@ def __init__(self, *args, **kwargs):
 
         # Variable for realized revenue
         self._asset_revenue_map = {}
+        self._asset_revenue_variable_port_map = {}
         self.__asset_revenue_var = {}
         self.__asset_revenue_nominals = {}
         self.__asset_revenue_bounds = {}
@@ -95,6 +97,163 @@ def pre(self):
         parameters = self.parameters(0)
         bounds = self.bounds()
 
+        for _owner, assets in self.energy_system_owners.items():
+            # All assets already have individual costs that can be used for the business cases
+            # Here we create revenue variables for the locations where energy is consumed or
+            # exhanged between owners
+
+            # Create revenue variable for every demand type asset
+            # The assumption is that if an organizational asset own the demand asset it has the
+            # single right to sell energy to that demand.
+            for asset in assets:
+                if asset in [
+                    *self.energy_system_components.get("heat_demand", []),
+                    *self.energy_system_components.get("gas_demand", []),
+                    *self.energy_system_components.get("electricity_demand", []),
+                ]:
+                    # We check if we can find the carrier information used for that demand
+                    # Note that we thus assume that the get_{commodity}_carriers() functions are
+                    # set. In most practical cases this means using the ESDLExtraVarsMixin
+                    var_name = None
+                    nominal_power = None
+                    carrier_name = None
+                    for _id, attr in self.get_electricity_carriers().items():
+                        # check if we can find the carried id
+                        if (
+                            attr["id_number_mapping"]
+                            == parameters[f"{asset}.ElectricityIn.carrier_id"]
+                        ):
+                            # Note that we are including the port name at the end as we can have
+                            # multiple revenue variables for a single asset as there can be
+                            # multiple connections with different organizations over the different
+                            # ports.
+                            var_name = f"{asset}__revenue_ElectricityIn"
+                            carrier_name = attr["name"]
+                            nominal_power = self.variable_nominal(f"{asset}.Electricity_demand")
+                            # Here we same the variable which should be used for the energy flow
+                            # between the organizations and thus for computing the revenue.
+                            self._asset_revenue_variable_port_map[var_name] = (
+                                f"{asset}.ElectricityIn.Power"
+                            )
+                    for _id, attr in self.get_gas_carriers().items():
+                        if attr["id_number_mapping"] == parameters[f"{asset}.GasIn.carrier_id"]:
+                            var_name = f"{asset}__revenue_GasIn"
+                            carrier_name = attr["name"]
+                            nominal_power = self.variable_nominal(f"{asset}.Gas_demand")
+                            self._asset_revenue_variable_port_map[var_name] = f"{asset}.GasIn.Q"
+                    for _id, attr in self.get_heat_carriers().items():
+                        if attr["id_number_mapping"] == parameters[f"{asset}.HeatIn.carrier_id"]:
+                            var_name = f"{asset}__revenue_HeatIn"
+                            carrier_name = attr["name"]
+                            nominal_power = self.variable_nominal(f"{asset}.Heat_demand")
+                            self._asset_revenue_variable_port_map[var_name] = f"{asset}.HeatIn.Heat"
+                    # Only if we could fing the carrier information we create the revenue variable
+                    # and thus the constraints.
+                    if carrier_name is not None:
+                        self._asset_revenue_map[asset] = [var_name]
+                        self.__asset_revenue_var[var_name] = ca.MX.sym(var_name)
+                        try:
+                            price_profile = self.get_timeseries(
+                                f"{carrier_name}.price_profile"
+                            ).values
+                        except KeyError:
+                            price_profile = np.ones(len(self.times()))
+                        avg_price = np.mean(price_profile) if np.mean(price_profile) else 1.0
+                        self.__asset_revenue_nominals[var_name] = avg_price * nominal_power
+                        self.__asset_revenue_bounds[var_name] = (0.0, np.inf)
+
+            # Find the assets that exchange energy with other owners and create a revenue variable
+            # for them as well We loop over the assets
+            for asset in assets:
+                # This is something extra I created. It is a nested list in the form of:
+                # [[asset1.HeatIn, asset2.HeatOut], [asset3.HeatIn, asset4.HeatOut], ...]
+                conn = self.get_connections()
+                # We loop over the connections (yes this is inefficient)
+                for connection in conn:
+                    # Here we check if our asset is in the connection hence we find a connected
+                    # asset
+                    if asset == connection[0].split(".")[0] or asset == connection[1].split(".")[0]:
+                        other_asset = (
+                            connection[0].split(".")[0]
+                            if asset == connection[1].split(".")[0]
+                            else connection[1].split(".")[0]
+                        )
+                        # This bit of code is used to go from for example:
+                        # HeatExchanger.Secondary.HeatIn -> Secondary.HeatIn
+                        temp = (
+                            connection[1].split(".")[1:]
+                            if asset == connection[1].split(".")[0]
+                            else connection[0].split(".")[1:]
+                        )
+                        port = temp[0]
+                        for x in temp[1:]:
+                            port = port + "." + x
+
+                        # Here we check that the connected asset is not also owned by the same
+                        # entity. If the other asset belongs to an organization we create a
+                        # revenue variable to represent the cashflow associated with the energy
+                        # exchanged between the two organizations.
+                        if other_asset not in assets:
+                            var_name = f"{asset}__revenue_{port}"
+                            nominal_power = None
+                            carrier_name = None
+                            for _id, attr in self.get_electricity_carriers().items():
+                                self._asset_revenue_variable_port_map[var_name] = (
+                                    f"{asset}.{port}.Power"
+                                )
+                                if (
+                                    attr["id_number_mapping"]
+                                    == parameters[f"{asset}.{port}.carrier_id"]
+                                ):
+                                    nominal_power = self.variable_nominal(f"{asset}.{port}.Power")
+                                    carrier_name = attr["name"]
+                            for _id, attr in self.get_gas_carriers().items():
+                                self._asset_revenue_variable_port_map[var_name] = (
+                                    f"{asset}.{port}.Q"
+                                )
+                                if (
+                                    attr["id_number_mapping"]
+                                    == parameters[f"{asset}.{port}.carrier_id"]
+                                ):
+                                    nominal_power = self.variable_nominal(f"{asset}.{port}.Q")
+                                    carrier_name = attr["name"]
+                            for _id, attr in self.get_heat_carriers().items():
+                                self._asset_revenue_variable_port_map[var_name] = (
+                                    f"{asset}.{port}.Heat"
+                                )
+                                if (
+                                    attr["id_number_mapping"]
+                                    == parameters[f"{asset}.{port}.carrier_id"]
+                                ):
+                                    nominal_power = self.variable_nominal(f"{asset}.{port}.Heat")
+                                    carrier_name = attr["name"]
+                            if carrier_name is not None:
+                                # Please note that we create a dict mapping with a list. As a single
+                                # asset can have multiple revenue variables as it can have
+                                # connections with other organizations on different ports.
+                                try:
+                                    self._asset_revenue_map[asset].append(var_name)
+                                except KeyError:
+                                    self._asset_revenue_map[asset] = [var_name]
+                                self.__asset_revenue_var[var_name] = ca.MX.sym(var_name)
+                                try:
+                                    price_profile = self.get_timeseries(
+                                        f"{carrier_name}.price_profile"
+                                    ).values
+                                except NameError:
+                                    price_profile = np.ones(len(self.times()))
+                                except KeyError:
+                                    price_profile = np.ones(len(self.times()))
+                                avg_price = (
+                                    np.mean(price_profile) if np.mean(price_profile) else 1.0
+                                )
+                                self.__asset_revenue_nominals[var_name] = (
+                                    avg_price * nominal_power
+                                    if nominal_power is not None
+                                    else 1.0e2
+                                )
+                                self.__asset_revenue_bounds[var_name] = (-np.inf, np.inf)
+
         # Making the cost variables; fixed_operational_cost, variable_operational_cost,
         # installation_cost and investment_cost
         for asset_name in [
@@ -391,37 +550,6 @@ def pre(self):
                 else 1.0e2
             )
 
-            # Realized revenue
-            if (asset_name) in [
-                *self.energy_system_components.get("electricity_demand", []),
-                *self.energy_system_components.get("gas_demand", []),
-            ]:
-
-                carrier_name = None
-                for _id, attr in self.get_electricity_carriers().items():
-                    if attr["id_number_mapping"] == parameters[f"{asset_name}.id_mapping_carrier"]:
-                        carrier_name = attr["name"]
-                for _id, attr in self.get_gas_carriers().items():
-                    if attr["id_number_mapping"] == parameters[f"{asset_name}.id_mapping_carrier"]:
-                        carrier_name = attr["name"]
-                if carrier_name is not None:
-                    asset_revenue_var = f"{asset_name}__revenue"
-                    self._asset_revenue_map[asset_name] = asset_revenue_var
-                    self.__asset_revenue_var[asset_revenue_var] = ca.MX.sym(asset_revenue_var)
-                    self.__asset_revenue_bounds[asset_revenue_var] = (
-                        0.0,
-                        np.inf,
-                    )
-                    self.__asset_revenue_nominals[asset_revenue_var] = (
-                        max(
-                            np.mean(self.get_timeseries(f"{carrier_name}.price_profile").values)
-                            * nominal_fixed_operational,
-                            1.0e2,
-                        )
-                        if nominal_fixed_operational is not None
-                        else 1.0e2
-                    )
-
         for asset in [
             *self.energy_system_components.get("heat_source", []),
             *self.energy_system_components.get("heat_demand", []),
@@ -1305,44 +1433,91 @@ def __revenue_constraints(self, ensemble_member):
         # TODO: add fixed price default from ESDL in case no price profile is defined.
         parameters = self.parameters(ensemble_member)
 
-        for demand in [
-            *self.energy_system_components.get("gas_demand", []),
-            *self.energy_system_components.get("electricity_demand", []),
-        ]:
-
-            carrier_name = None
-            for _id, attr in self.get_electricity_carriers().items():
-                if attr["id_number_mapping"] == parameters[f"{demand}.id_mapping_carrier"]:
-                    carrier_name = attr["name"]
-                    cost_multiplier = 1 / 3600.0  # priceprofile electricity is EUR/Wh
-            for _id, attr in self.get_gas_carriers().items():
-                if attr["id_number_mapping"] == parameters[f"{demand}.id_mapping_carrier"]:
-                    carrier_name = attr["name"]
-                    cost_multiplier = 1.0  # priceprofile gas is in EUR/g
-            if carrier_name is not None:
-                price_profile = self.get_timeseries(f"{carrier_name}.price_profile").values
-
-                if demand in self.energy_system_components.get("gas_demand", []):
-                    energy_flow = self.__state_vector_scaled(
-                        f"{demand}.Gas_demand_mass_flow", ensemble_member  # g/s
-                    )
+        # Here we compute the revenue by looping over all the revenue variables.
+        for asset, variable_revenue_vars in self._asset_revenue_map.items():
+            # note we need a nested loop as a asset can have multiple revenue variables
+            for variable_revenue_var in variable_revenue_vars:
+                carrier_name = None
+                port = None
+                # We find the associated carrier and port (is the full string with asset name
+                # included)
+                port_name = self._asset_revenue_variable_port_map[variable_revenue_var]
+                for _id, attr in self.get_electricity_carriers().items():
+                    if (
+                        attr["id_number_mapping"]
+                        == parameters[f"{asset}.{port_name.split('.')[-2]}.carrier_id"]
+                    ):
+                        carrier_name = attr["name"]
+                        port = f"{self._asset_revenue_variable_port_map[variable_revenue_var]}"
+                for _id, attr in self.get_gas_carriers().items():
+                    if (
+                        attr["id_number_mapping"]
+                        == parameters[f"{asset}.{port_name.split('.')[-2]}.carrier_id"]
+                    ):
+                        carrier_name = attr["name"]
+                        port = f"{self._asset_revenue_variable_port_map[variable_revenue_var]}"
+                for _id, attr in self.get_heat_carriers().items():
+                    temp = self._asset_revenue_variable_port_map[variable_revenue_var].split(".")
+                    full_port = temp[1]
+                    for x in temp[2:-1]:
+                        full_port = full_port + "." + x
+                    if attr["id_number_mapping"] == parameters[f"{asset}.{full_port}.carrier_id"]:
+                        carrier_name = attr["name"]
+                        port = f"{self._asset_revenue_variable_port_map[variable_revenue_var]}"
 
-                elif demand in self.energy_system_components.get("electricity_demand", []):
-                    energy_flow = self.__state_vector_scaled(
-                        f"{demand}.Electricity_demand", ensemble_member
+                # This if statement should not be needed...
+                if carrier_name is not None:
+                    try:
+                        price_profile = self.get_timeseries(f"{carrier_name}.price_profile").values
+                    except KeyError:
+                        price_profile = np.ones(len(self.times()))
+                    energy_flow = self.__state_vector_scaled(f"{port}", ensemble_member)
+                    # Here we find the sign of the flow, meaning that energy going into the asset is
+                    # negative revenue.
+                    energy_flow_sign = 1.0
+                    if "In" in port and asset not in [
+                        *self.energy_system_components.get("heat_demand", []),
+                        *self.energy_system_components.get("gas_demand", []),
+                        *self.energy_system_components.get("electricity_demand", []),
+                    ]:
+                        energy_flow_sign = -1.0
+                    # For nodes/busses we do this by checking the type of port in the topology
+                    # object. It is a bit of a hassle as we need to find the index of the port of
+                    # the node for that we find the last digit (which by definition is the port
+                    # index) in the port name string.
+                    if asset in self.energy_system_topology.nodes.keys():
+                        port_number = int([x for x in port if x.isdigit()][-1])
+                        if (
+                            self.energy_system_topology.nodes[f"{asset}"][port_number][1]
+                            == NodeConnectionDirection.IN
+                        ):
+                            energy_flow_sign = -1.0
+                    if asset in self.energy_system_topology.gas_nodes.keys():
+                        port_number = int([x for x in port if x.isdigit()][-1])
+                        if (
+                            self.energy_system_topology.gas_nodes[f"{asset}"][port_number][1]
+                            == NodeConnectionDirection.IN
+                        ):
+                            energy_flow_sign = -1.0
+                    if asset in self.energy_system_topology.busses.keys():
+                        port_number = int([x for x in port if x.isdigit()][-1])
+                        if (
+                            self.energy_system_topology.busses[f"{asset}"][port_number][1]
+                            == NodeConnectionDirection.IN
+                        ):
+                            energy_flow_sign = -1.0
+                    variable_revenue = self.extra_variable(variable_revenue_var, ensemble_member)
+                    nominal = self.variable_nominal(variable_revenue_var)
+
+                    sum = 0.0
+                    timesteps = np.diff(self.times()) / 3600.0
+                    for i in range(1, len(self.times())):
+                        sum += price_profile[i] * energy_flow[i] * timesteps[i - 1]
+
+                    constraints.append(
+                        ((variable_revenue - sum * energy_flow_sign) / (nominal), 0.0, 0.0)
                     )
 
-                variable_revenue_var = self._asset_revenue_map[demand]
-                variable_revenue = self.extra_variable(variable_revenue_var, ensemble_member)
-                nominal = self.variable_nominal(variable_revenue_var)
-
-                sum = 0.0
-                timesteps = np.diff(self.times()) * cost_multiplier
-                for i in range(1, len(self.times())):
-                    sum += price_profile[i] * energy_flow[i] * timesteps[i - 1]
-
-                constraints.append(((variable_revenue - sum) / (nominal), 0.0, 0.0))
-
         return constraints
 
     def path_constraints(self, ensemble_member):
diff --git a/src/mesido/pycml/component_library/milp/_internal/heat_component.py b/src/mesido/pycml/component_library/milp/_internal/heat_component.py
index ed8ef61b3..3e558a673 100644
--- a/src/mesido/pycml/component_library/milp/_internal/heat_component.py
+++ b/src/mesido/pycml/component_library/milp/_internal/heat_component.py
@@ -22,6 +22,8 @@ def __init__(self, name, **modifiers):
         super().__init__(name, **modifiers)
         self.state = 1
 
+        self.owner = "__"
+
         self.variable_operational_cost_coefficient = 0.0
         self.fixed_operational_cost_coefficient = 0.0
         self.investment_cost_coefficient = 0.0
diff --git a/src/mesido/pycml/component_library/milp/electricity/electricity_base.py b/src/mesido/pycml/component_library/milp/electricity/electricity_base.py
index 28c7a6a5f..3675a8b38 100644
--- a/src/mesido/pycml/component_library/milp/electricity/electricity_base.py
+++ b/src/mesido/pycml/component_library/milp/electricity/electricity_base.py
@@ -12,6 +12,8 @@ class ElectricityPort(ElectricityComponent, Connector):
     def __init__(self, name, **modifiers):
         super().__init__(name, **modifiers)
 
+        self.carrier_id = -1
+
         self.add_variable(Variable, "Power")
         self.add_variable(Variable, "I")
         self.add_variable(Variable, "V", min=0.0)
diff --git a/src/mesido/pycml/component_library/milp/electricity/electricity_node.py b/src/mesido/pycml/component_library/milp/electricity/electricity_node.py
index 2aeabf80c..17ec8bc25 100644
--- a/src/mesido/pycml/component_library/milp/electricity/electricity_node.py
+++ b/src/mesido/pycml/component_library/milp/electricity/electricity_node.py
@@ -24,6 +24,7 @@ def __init__(self, name, **modifiers):
 
         self.n = 2
         assert self.n >= 2
+        self.carrier_id = -1
 
         self.add_variable(ElectricityPort, "ElectricityConn", self.n)
         self.add_variable(Variable, "V", min=0.0, nominal=self.voltage_nominal)
@@ -33,3 +34,6 @@ def __init__(self, name, **modifiers):
 
         # Because the orientation of the connected cables are important to setup the energy
         # conservation, these constraints are added in the mixin.
+
+        for i in range(1, self.n + 1):
+            self.ElectricityConn[i].carrier_id = self.carrier_id
diff --git a/src/mesido/pycml/component_library/milp/gas/gas_base.py b/src/mesido/pycml/component_library/milp/gas/gas_base.py
index 3583be82b..3e620ad73 100644
--- a/src/mesido/pycml/component_library/milp/gas/gas_base.py
+++ b/src/mesido/pycml/component_library/milp/gas/gas_base.py
@@ -14,6 +14,9 @@ def __init__(self, name, **modifiers):
         super().__init__(name, **modifiers)
         # TODO: think of more elegant approach for Q_shadow, currently required to ensure that
         #  every port has a unique variable to make the correct port mapping
+
+        self.carrier_id = -1
+
         self.add_variable(Variable, "Q")  # [m3/s]
         self.add_variable(Variable, "mass_flow")  # [g/s]
         self.add_variable(Variable, "H")  # [m]
diff --git a/src/mesido/pycml/component_library/milp/gas/gas_node.py b/src/mesido/pycml/component_library/milp/gas/gas_node.py
index b68246301..9a8e31e1a 100644
--- a/src/mesido/pycml/component_library/milp/gas/gas_node.py
+++ b/src/mesido/pycml/component_library/milp/gas/gas_node.py
@@ -20,6 +20,7 @@ def __init__(self, name, **modifiers):
 
         self.n = 2
         assert self.n >= 2
+        self.carrier_id = -1
 
         self.add_variable(GasPort, "GasConn", self.n)
         self.add_variable(Variable, "H", min=0.0)
@@ -29,3 +30,6 @@ def __init__(self, name, **modifiers):
 
         # Because the orientation of the connected pipes are important to setup the mass
         # conservation, these constraints are added in the mixin.
+
+        for i in range(1, self.n + 1):
+            self.GasConn[i].carrier_id = self.carrier_id
diff --git a/src/mesido/pycml/component_library/milp/heat/heat_port.py b/src/mesido/pycml/component_library/milp/heat/heat_port.py
index 9ba7ef285..f5a9c61f5 100644
--- a/src/mesido/pycml/component_library/milp/heat/heat_port.py
+++ b/src/mesido/pycml/component_library/milp/heat/heat_port.py
@@ -12,6 +12,8 @@ class HeatPort(HeatComponent, Connector):
     def __init__(self, name, **modifiers):
         super().__init__(name, **modifiers)
 
+        self.carrier_id = -1
+
         self.add_variable(Variable, "Heat")
         self.add_variable(Variable, "Q")
         self.add_variable(Variable, "H")
diff --git a/src/mesido/pycml/component_library/milp/heat/node.py b/src/mesido/pycml/component_library/milp/heat/node.py
index 1c767077f..1b098908d 100644
--- a/src/mesido/pycml/component_library/milp/heat/node.py
+++ b/src/mesido/pycml/component_library/milp/heat/node.py
@@ -20,6 +20,7 @@ def __init__(self, name, **modifiers):
 
         self.n = 2
         assert self.n >= 2
+        self.carrier_id = -1
 
         self.add_variable(HeatPort, "HeatConn", self.n)
         self.add_variable(Variable, "H")
@@ -31,3 +32,6 @@ def __init__(self, name, **modifiers):
         for i in range(1, self.n + 1):
             self.add_equation(self.HeatConn[i].H - self.H)
             # Q and Heat to be set in the mixin
+
+        for i in range(1, self.n + 1):
+            self.HeatConn[i].carrier_id = self.carrier_id
diff --git a/tests/models/heat_exchange/input/timeseries.csv b/tests/models/heat_exchange/input/timeseries.csv
new file mode 100644
index 000000000..fd7ed1290
--- /dev/null
+++ b/tests/models/heat_exchange/input/timeseries.csv
@@ -0,0 +1,4 @@
+DateTime,HeatingDemand_3322,HeatingDemand_18aa,heat1,heat1_ret,heat2,heat2_ret
+01-01-2019 00:00, 350000., 350000.,1.,1.,2.,2.
+01-01-2019 01:00, 350000., 350000.,1.,1.,2.,2.
+01-01-2019 02:00, 350000., 350000.,1.,1.,2.,2.
diff --git a/tests/models/heat_exchange/model/network_with_parties.esdl b/tests/models/heat_exchange/model/network_with_parties.esdl
new file mode 100644
index 000000000..7bf18466c
--- /dev/null
+++ b/tests/models/heat_exchange/model/network_with_parties.esdl
@@ -0,0 +1,298 @@
+<?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" id="0735d19f-39a4-463d-bf28-cf0b28b88bef_with_return_network" description="" esdlVersion="v2207" name="Untitled EnergySystem with return network" version="7">
+  <energySystemInformation xsi:type="esdl:EnergySystemInformation" id="b7ebaafe-597c-4055-bc88-b47cdfa84e34">
+    <carriers xsi:type="esdl:Carriers" id="5d5909a4-18ec-4aa3-a08a-1e9539a20be2">
+      <carrier xsi:type="esdl:HeatCommodity" name="heat1" supplyTemperature="90.0" id="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+      <carrier xsi:type="esdl:HeatCommodity" name="heat2" supplyTemperature="70.0" id="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+      <carrier xsi:type="esdl:HeatCommodity" name="heat1_ret" returnTemperature="50.0" id="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+      <carrier xsi:type="esdl:HeatCommodity" name="heat2_ret" returnTemperature="40.0" id="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+    </carriers>
+  </energySystemInformation>
+  <parties xsi:type="esdl:Parties">
+    <party xsi:type="esdl:Party" id="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" owns="Pipe1_ret Pipe1 61b8d7e1-aa99-439e-86b2-ea596e728932 Pipe2_ret Pipe2 3322fe41-f73b-4ba4-b87b-bf8315aa69e4 cea5d37b-7edd-488f-a1d7-b37b9451459a 8581fd27-994d-4848-a458-1dd8c8f1f684 ce6861d7-f06f-4391-adcf-bb1284c24718 71ef008d-7412-4db6-9d42-adba1a7f59d1 39ed1de8-8c7a-4e3c-8e52-45a0b209a176" name="Somebody1"/>
+    <party xsi:type="esdl:Party" id="5606bc9c-7592-4d10-9131-a6d5ec559de1" owns="aec9bf5f-ce40-4a6e-b2d6-d64e566ce147" name="Somebody2"/>
+  </parties>
+  <instance xsi:type="esdl:Instance" id="82399ebf-5e52-465d-830a-b502d6c1012b" name="MultipleCarrierTest">
+    <area xsi:type="esdl:Area" id="e91b7896-ae7a-4136-8e96-d98d40c49fc2" name="MultipleCarrierTest">
+      <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_3322" power="10000000.0" id="3322fe41-f73b-4ba4-b87b-bf8315aa69e4" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267">
+        <port xsi:type="esdl:InPort" name="In" connectedTo="43e98a06-8db5-43a1-913b-e8e7f255fc3f" id="06b6b748-d052-4fd5-a017-ff76321284a9" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="46e659aa-0e2b-43af-b38c-242cb7fdc480" id="01ea44bf-6f10-4913-bd41-5e5b210d3b40" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.37633514404297" lat="52.09026545046112" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:HeatingDemand" name="HeatingDemand_18aa" power="10000000.0" id="18aabae2-c92a-4f55-ad80-4dce8be795e0">
+        <port xsi:type="esdl:InPort" name="In" connectedTo="9b760b7c-1e69-4653-b322-1aa3d4040be2" id="eb6769ba-4a7d-4e1a-8f89-0e1f60d86f32" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="48427c64-4346-46db-989a-d75df7faff3e" id="a79a74b2-6ca2-4098-827b-7895d4ebb631" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.375905990600587" lat="52.08245983569832" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:ResidualHeatSource" name="ResidualHeatSource_61b8" power="10000000.0" id="61b8d7e1-aa99-439e-86b2-ea596e728932" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267">
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="309f0881-e58e-4a63-a3c2-c9ca971d2150" id="c932c77b-d5e5-40eb-b9c8-c67b8d0e25e9" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="167022d9-0487-4acf-80ae-c7268c44724a" id="7c3e792b-9c73-49af-9845-1ee16dcb2a27" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.400968551635743" lat="52.09084554299605" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:ResidualHeatSource" name="ResidualHeatSource_aec9" power="200000.0" id="aec9bf5f-ce40-4a6e-b2d6-d64e566ce147" isOwnedBy="5606bc9c-7592-4d10-9131-a6d5ec559de1">
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="5692ae05-f9c4-4f28-8a53-21bcafedf9a9" id="b466eb33-ed48-4685-bd88-63499e8e36db" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="5f1b694c-4562-469e-a8b8-531cc9ea143b" id="12e2b556-699f-497e-aa86-2284936c3658" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.400711059570313" lat="52.08245983569832" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:Joint" name="Joint_7ffe" id="7ffe304e-0363-4634-aef5-a5da3343d7f5">
+        <port xsi:type="esdl:InPort" name="In" connectedTo="28a0d33d-8b5e-431c-8e2a-c78a6fca3c31 1fb45b83-fc31-475f-9ced-0f9f17a2c454" id="5d0f5b7b-53b9-4999-82d1-0eee38a37791" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="dd5fcdd7-6779-4743-bee1-439e3df7d5ab" id="2950515a-1a1e-4e7b-a53b-65af13db7a45" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <geometry xsi:type="esdl:Point" lon="4.388008117675782" lat="52.082407090414286" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:Joint" name="Joint_8581" id="8581fd27-994d-4848-a458-1dd8c8f1f684" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267">
+        <port xsi:type="esdl:InPort" name="In" connectedTo="1eac327d-7ab8-48b8-8d33-6445416dd352" id="b0954a57-c90f-4601-837f-e593b3e90b51" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="c5ff5fe1-8e51-4292-b51a-599d10d1683d 7206613a-713e-42af-8c0e-ff16195ec3ad" id="76930ec6-55eb-4a0e-8880-3ea0ef74a327" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <geometry xsi:type="esdl:Point" lon="4.387664794921876" lat="52.09084554299605" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="908.9" name="Pipe1" innerDiameter="0.3127" related="Pipe1_ret" outerDiameter="0.45" id="Pipe1" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="febeba99-31d3-4dd3-bfad-0b95be773496">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="c932c77b-d5e5-40eb-b9c8-c67b8d0e25e9" id="309f0881-e58e-4a63-a3c2-c9ca971d2150" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="b0954a57-c90f-4601-837f-e593b3e90b51" id="1eac327d-7ab8-48b8-8d33-6445416dd352" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.400968551635743" lat="52.09084554299605"/>
+          <point xsi:type="esdl:Point" lon="4.387664794921876" lat="52.09084554299605"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="776.7" name="Pipe2" innerDiameter="0.3127" related="Pipe2_ret" outerDiameter="0.45" id="Pipe2" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="1def15d6-d08b-488a-9448-51abda40cba3">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="76930ec6-55eb-4a0e-8880-3ea0ef74a327" id="c5ff5fe1-8e51-4292-b51a-599d10d1683d" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="06b6b748-d052-4fd5-a017-ff76321284a9" id="43e98a06-8db5-43a1-913b-e8e7f255fc3f" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.387664794921876" lat="52.09084554299605"/>
+          <point xsi:type="esdl:Point" lon="4.37633514404297" lat="52.09026545046112"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="868.0" name="Pipe3" innerDiameter="0.3127" related="Pipe3_ret" outerDiameter="0.45" id="Pipe3" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="56ae609b-7db1-4709-a514-6b3457f3509d">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="b466eb33-ed48-4685-bd88-63499e8e36db" id="5692ae05-f9c4-4f28-8a53-21bcafedf9a9" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="5d0f5b7b-53b9-4999-82d1-0eee38a37791" id="28a0d33d-8b5e-431c-8e2a-c78a6fca3c31" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.400711059570313" lat="52.08245983569832"/>
+          <point xsi:type="esdl:Point" lon="4.388008117675782" lat="52.082407090414286"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="827.0" name="Pipe4" innerDiameter="0.3127" related="Pipe4_ret" outerDiameter="0.45" id="Pipe4" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="47ce9c1a-2eaa-4905-9fd5-00f1ce0c5413">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="2950515a-1a1e-4e7b-a53b-65af13db7a45" id="dd5fcdd7-6779-4743-bee1-439e3df7d5ab" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="eb6769ba-4a7d-4e1a-8f89-0e1f60d86f32" id="9b760b7c-1e69-4653-b322-1aa3d4040be2" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.388008117675782" lat="52.082407090414286"/>
+          <point xsi:type="esdl:Point" lon="4.375905990600587" lat="52.08245983569832"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Joint" name="Joint_7ffe_ret" id="0554c01f-71e6-4736-abc0-31cda8d834a7">
+        <port xsi:type="esdl:InPort" name="ret_port" connectedTo="dee6c805-0d6e-40cc-ac57-836481b371e7" id="e9e1badb-a5a2-4637-8ce2-94a7b1564a54" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <port xsi:type="esdl:OutPort" name="ret_port" connectedTo="bd02ded1-f0ea-4192-b304-7d8c128eee0b f7beb290-c113-4f55-ad8b-7a3a6d096b23" id="616137cf-6758-4091-abf1-220d21169b7a" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.387485812242726" lat="52.08249709050428" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:Joint" name="Joint_8581_ret" id="cea5d37b-7edd-488f-a1d7-b37b9451459a" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267">
+        <port xsi:type="esdl:OutPort" name="ret_port" connectedTo="3a4a6955-9073-46ee-bbc7-52b894bc21d1" id="6f5b062b-a1e9-4d70-b743-1e43501a59fe" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <port xsi:type="esdl:InPort" name="ret_port" connectedTo="d4c09201-f88b-4c3a-99cf-594d5e188605 b7e1cb61-6809-4a3e-8053-3eac95fadcd4" id="17cc66e1-5c3f-48d6-8aa3-3a19fb9b0c8e" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.38715944579282" lat="52.09093554308605" CRS="WGS84"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="908.9" name="Pipe1_ret" innerDiameter="0.3127" related="Pipe1" outerDiameter="0.45" id="Pipe1_ret" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" diameter="DN300">
+        <port xsi:type="esdl:InPort" name="In_ret" connectedTo="6f5b062b-a1e9-4d70-b743-1e43501a59fe" id="3a4a6955-9073-46ee-bbc7-52b894bc21d1" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" connectedTo="7c3e792b-9c73-49af-9845-1ee16dcb2a27" id="167022d9-0487-4acf-80ae-c7268c44724a" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.38715944579282" lat="52.09093554308605" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.400463202506687" lat="52.09093554308605" CRS="WGS84"/>
+        </geometry>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="776.7" name="Pipe2_ret" innerDiameter="0.3127" related="Pipe2" outerDiameter="0.45" id="Pipe2_ret" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" diameter="DN300">
+        <port xsi:type="esdl:InPort" name="In_ret" connectedTo="01ea44bf-6f10-4913-bd41-5e5b210d3b40" id="46e659aa-0e2b-43af-b38c-242cb7fdc480" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" connectedTo="17cc66e1-5c3f-48d6-8aa3-3a19fb9b0c8e" id="d4c09201-f88b-4c3a-99cf-594d5e188605" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.375828665733543" lat="52.090355450551115" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.38715944579282" lat="52.09093554308605" CRS="WGS84"/>
+        </geometry>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="868.0" name="Pipe3_ret" innerDiameter="0.3127" related="Pipe3" outerDiameter="0.45" id="Pipe3_ret" diameter="DN300">
+        <port xsi:type="esdl:InPort" name="In_ret" connectedTo="616137cf-6758-4091-abf1-220d21169b7a" id="bd02ded1-f0ea-4192-b304-7d8c128eee0b" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" connectedTo="12e2b556-699f-497e-aa86-2284936c3658" id="5f1b694c-4562-469e-a8b8-531cc9ea143b" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.387485812242726" lat="52.08249709050428" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.400188863774152" lat="52.08254983578832" CRS="WGS84"/>
+        </geometry>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="827.0" name="Pipe4_ret" innerDiameter="0.3127" related="Pipe4" outerDiameter="0.45" id="Pipe4_ret" diameter="DN300">
+        <port xsi:type="esdl:InPort" name="In_ret" connectedTo="a79a74b2-6ca2-4098-827b-7895d4ebb631" id="48427c64-4346-46db-989a-d75df7faff3e" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <port xsi:type="esdl:OutPort" name="Out_ret" connectedTo="e9e1badb-a5a2-4637-8ce2-94a7b1564a54" id="dee6c805-0d6e-40cc-ac57-836481b371e7" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <geometry xsi:type="esdl:Line">
+          <point xsi:type="esdl:Point" lon="4.375383794804425" lat="52.08254983578832" CRS="WGS84"/>
+          <point xsi:type="esdl:Point" lon="4.387485812242726" lat="52.08249709050428" CRS="WGS84"/>
+        </geometry>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="455.2" name="Pipe_ce68" innerDiameter="0.3127" outerDiameter="0.45" id="ce6861d7-f06f-4391-adcf-bb1284c24718" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="5888dfba-51d2-4562-b1f4-6b3965f20eba">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="76930ec6-55eb-4a0e-8880-3ea0ef74a327" id="7206613a-713e-42af-8c0e-ff16195ec3ad" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="230bf10b-c2f5-4ef9-b865-2863133a8156" id="22daf91b-d674-4fe9-b35b-360a731c173b" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.387664794921876" lat="52.09084554299605"/>
+          <point xsi:type="esdl:Point" lon="4.387589693069459" lat="52.08675177427041"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="404.9" name="Pipe_408e" innerDiameter="0.3127" outerDiameter="0.45" id="408e117a-809b-458e-bd9f-1ead868fc84a" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="3efcdead-3f3b-4972-b7e9-dd3dbebabb81">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="e150e40b-4c79-4f88-8118-be593084f286" id="5a64ebd4-90d9-471e-b413-5948c25cf9c8" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="5d0f5b7b-53b9-4999-82d1-0eee38a37791" id="1fb45b83-fc31-475f-9ced-0f9f17a2c454" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.387664794921876" lat="52.08633644341566"/>
+          <point xsi:type="esdl:Point" lon="4.387879371643067" lat="52.08269718870518"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="413.5" name="Pipe_408e_ret" innerDiameter="0.3127" outerDiameter="0.45" id="9a7df578-3001-4e0b-a902-fca2665bef9c" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="0970189c-8baa-4c65-83ab-d13e0b7c03c0">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="616137cf-6758-4091-abf1-220d21169b7a" id="f7beb290-c113-4f55-ad8b-7a3a6d096b23" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="3386f229-42cb-4bc5-9824-de3f2dc7cd7f" id="96a5a980-06b9-4519-bc9b-c61e2f86537d" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.3873000144958505" lat="52.08268400246011"/>
+          <point xsi:type="esdl:Point" lon="4.387278556823731" lat="52.086402369206255"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:Pipe" length="436.9" name="Pipe_ce68_ret" innerDiameter="0.3127" outerDiameter="0.45" id="71ef008d-7412-4db6-9d42-adba1a7f59d1" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267" diameter="DN300">
+        <costInformation xsi:type="esdl:CostInformation" id="52bf58f4-7c46-48f7-9f28-4590b6719641">
+          <investmentCosts xsi:type="esdl:SingleValue" id="1e93bdda-8a74-42d5-960d-d64e4dff2025" value="1962.1" name="Combined investment and installation costs">
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" id="983f0959-8566-43ce-a380-782d29406ed3" perUnit="METRE" physicalQuantity="COST" description="Costs in EUR/m" unit="EURO"/>
+          </investmentCosts>
+        </costInformation>
+        <port xsi:type="esdl:InPort" name="In" connectedTo="861b1adf-1050-48b7-821e-58eea67d479b" id="ef6d471c-ead8-4541-853e-f85dea09e2be" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <port xsi:type="esdl:OutPort" name="Out" connectedTo="17cc66e1-5c3f-48d6-8aa3-3a19fb9b0c8e" id="b7e1cb61-6809-4a3e-8053-3eac95fadcd4" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <material xsi:type="esdl:CompoundMatter" compoundType="LAYERED">
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0056">
+            <matter xsi:type="esdl:Material" name="steel" thermalConductivity="52.15" id="f4cee538-cc3b-4809-bd66-979f2ce9649b"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.05785">
+            <matter xsi:type="esdl:Material" name="PUR" thermalConductivity="0.027" id="e4c0350c-cd79-45b4-a45c-6259c750b478"/>
+          </component>
+          <component xsi:type="esdl:CompoundMatterComponent" layerWidth="0.0052">
+            <matter xsi:type="esdl:Material" name="HDPE" thermalConductivity="0.4" id="9a97f588-10fe-4a34-b0f2-277862151763"/>
+          </component>
+        </material>
+        <geometry xsi:type="esdl:Line" CRS="WGS84">
+          <point xsi:type="esdl:Point" lon="4.38732147216797" lat="52.0867319966983"/>
+          <point xsi:type="esdl:Point" lon="4.387235641479493" lat="52.09066096891663"/>
+        </geometry>
+        <dataSource xsi:type="esdl:DataSource" name="Logstor Product Catalogue Version 2020.03" attribution="https://www.logstor.com/media/6506/product-catalogue-uk-202003.pdf"/>
+      </asset>
+      <asset xsi:type="esdl:HeatExchange" name="HeatExchange_39ed" efficiency="0.9" heatTransferCoefficient="400000.0" id="39ed1de8-8c7a-4e3c-8e52-45a0b209a176" isOwnedBy="ea1183a6-71fc-48bd-ac3f-3e0d8cac9267">
+        <port xsi:type="esdl:InPort" name="PrimIn" connectedTo="22daf91b-d674-4fe9-b35b-360a731c173b" id="230bf10b-c2f5-4ef9-b865-2863133a8156" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe"/>
+        <port xsi:type="esdl:OutPort" name="PrimOut" connectedTo="ef6d471c-ead8-4541-853e-f85dea09e2be" id="861b1adf-1050-48b7-821e-58eea67d479b" carrier="d336e381-ca6f-442e-985e-9f4c2bec1efe_ret"/>
+        <port xsi:type="esdl:OutPort" name="SecOut" connectedTo="5a64ebd4-90d9-471e-b413-5948c25cf9c8" id="e150e40b-4c79-4f88-8118-be593084f286" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c"/>
+        <port xsi:type="esdl:InPort" name="SecIn" connectedTo="96a5a980-06b9-4519-bc9b-c61e2f86537d" id="3386f229-42cb-4bc5-9824-de3f2dc7cd7f" carrier="72126c73-87e9-4bf6-99cf-d02a6c07010c_ret"/>
+        <geometry xsi:type="esdl:Point" lon="4.387479722499848" lat="52.086540813049496"/>
+      </asset>
+    </area>
+  </instance>
+</esdl:EnergySystem>
diff --git a/tests/models/heat_exchange/src/run_heat_exchanger.py b/tests/models/heat_exchange/src/run_heat_exchanger.py
index a1847bcac..d7f22afde 100644
--- a/tests/models/heat_exchange/src/run_heat_exchanger.py
+++ b/tests/models/heat_exchange/src/run_heat_exchanger.py
@@ -1,8 +1,10 @@
+from mesido.esdl.esdl_additional_vars_mixin import ESDLAdditionalVarsMixin
 from mesido.esdl.esdl_mixin import ESDLMixin
 from mesido.esdl.esdl_parser import ESDLFileParser
 from mesido.esdl.profile_parser import ProfileReaderFromFile
 from mesido.head_loss_class import HeadLossOption
 from mesido.physics_mixin import PhysicsMixin
+from mesido.techno_economic_mixin import TechnoEconomicMixin
 from mesido.workflows.io.write_output import ScenarioOutput
 
 import numpy as np
@@ -70,7 +72,8 @@ def function(self, optimization_problem, ensemble_member):
 class HeatProblem(
     ScenarioOutput,
     _GoalsAndOptions,
-    PhysicsMixin,
+    ESDLAdditionalVarsMixin,
+    TechnoEconomicMixin,
     LinearizedOrderGoalProgrammingMixin,
     GoalProgrammingMixin,
     ESDLMixin,
@@ -208,7 +211,7 @@ def constraints(self, ensemble_member):
 
 class HeatProblemTvarDisableHEX(
     _GoalsAndOptions,
-    PhysicsMixin,
+    TechnoEconomicMixin,
     LinearizedOrderGoalProgrammingMixin,
     GoalProgrammingMixin,
     ESDLMixin,
@@ -315,9 +318,9 @@ def constraints(self, ensemble_member):
 if __name__ == "__main__":
     solution = run_optimization_problem(
         HeatProblem,
-        esdl_file_name="heat_exchanger.esdl",
+        esdl_file_name="network_with_parties.esdl",
         esdl_parser=ESDLFileParser,
         profile_reader=ProfileReaderFromFile,
-        input_timeseries_file="timeseries_import.xml",
+        input_timeseries_file="timeseries.csv",
     )
     results = solution.extract_results()
diff --git a/tests/models/heatpump/src/run_heat_pump.py b/tests/models/heatpump/src/run_heat_pump.py
index bb5f23e58..a5508b0ee 100644
--- a/tests/models/heatpump/src/run_heat_pump.py
+++ b/tests/models/heatpump/src/run_heat_pump.py
@@ -127,6 +127,9 @@ def solver_options(self):
         highs_options["mip_rel_gap"] = 0.001
         return options
 
+    def times(self, variable=None) -> np.ndarray:
+        return super().times(variable=variable)[:5]
+
     def temperature_carriers(self):
         return self.esdl_carriers  # geeft terug de carriers met multiple temperature options