diff --git a/Model_Library b/Model_Library
index 406b876cab78688c4f1f0430a9318d7af0286961..beba9ca7a11b3e4d31e372d35e1872a0a17e9fc1 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 406b876cab78688c4f1f0430a9318d7af0286961
+Subproject commit beba9ca7a11b3e4d31e372d35e1872a0a17e9fc1
diff --git a/input_files/convert_input_files_released_focused_refactoring.py b/input_files/convert_input_files_released_focused_refactoring.py
index 6664da3b65cb4cec2e0c09ebcb87f398fea52220..876de61f5c8d091a3a26cc45ae78c4b506c4ff47 100644
--- a/input_files/convert_input_files_released_focused_refactoring.py
+++ b/input_files/convert_input_files_released_focused_refactoring.py
@@ -7,69 +7,69 @@ import pandas as pd
 
 def component_to_commodities(type):
     if type == "AbsorptionChiller":
-        return "heat", "cold", None
+        return "heat", None, "cold", None
     if type == "CompressorChiller":
-        return "electricity", "cold", None
+        return "electricity", None, "cold", None
     if type == "CoolConsumption":
-        return "cold", None, None
+        return "cold", None, None, None
     if type == "CoolGrid":
-        return "cold", "cold", None
+        return "cold", None, "cold", None
     if type == "ChargingInfrastructure":
-        return "electricity", None, None
+        return "electricity", None, None, None
     if type == "ElectricalBusBar":
-        return "electricity", "electricity", None
+        return "electricity", None, "electricity", None
     if type == "ElectricalConsumption":
-        return "electricity", None, None
+        return "electricity", None, None, None
     if type == "ElectricalGrid":
-        return "electricity", "electricity", None
+        return "electricity", None, "electricity", None
     if type == "PVGenerator":
-        return None, "electricity", None
+        return None, None, "electricity", None
     if type == "DynamicInverter":
-        return "electricity", "electricity", None
+        return "electricity", None, "electricity", None
     if type == "StaticInverter":
-        return "electricity", "electricity", None
+        return "electricity", None, "electricity", None
     if type == "LiionBattery":
-        return "electricity", "electricity", None
+        return "electricity", None, "electricity", None
     if type == "BHKW":
-        return "gas", "heat", "electricity"
+        return "gas", None, "heat", "electricity"
     if type == "CHP":
-        return "gas", "heat", "electricity"
+        return "gas", None, "heat", "electricity"
     if type == "GasGrid":
-        return "gas", "gas", None
+        return "gas", None, "gas", None
     if type == "ElectricBoiler":
-        return "electricity", "heat", None
+        return "electricity", None, "heat", None
     if type == "GasBoiler":
-        return "gas", "heat", None
+        return "gas", None, "heat", None
     if type == "HeatGrid":
-        return "heat", "heat", None
+        return "heat", None, "heat", None
     if type == "ElectricRadiator":
-        return "electricity", "heat", None
+        return "electricity", None, "heat", None
     if type == "HeatConsumption":
-        return "heat", None, None
+        return "heat", None, None, None
     if type == "Radiator":
-        return "heat", None, None
+        return "heat", None, None, None
     if type == "UnderfloorHeat":
-        return "heat", "heat", None
+        return "heat", None, "heat", None
     if type == "HeatExchanger":
-        return "heat", "heat", None
+        return "heat", None, "heat", None
     if type == "GasHeatPump":
-        return "gas", "heat", None
+        return "gas", None, "heat", None
     if type == "HeatPump":
-        return "electricity", "heat", None
+        return "electricity", None, "heat", None
     if type == "HotWaterConsumption":
-        return "heat", None, None
+        return "heat", None, None, None
     if type == "SolarThermalCollector":
-        return None, "heat", None
+        return None, None, "heat", None
     if type == "HotWaterStorage":
-        return "heat", "heat", None
+        return "heat", None, "heat", None
     if type == "PEMElectrolyzer":
-        return "electricity", "hydrogen", None
+        return "electricity", None, "hydrogen", None
     if type == "PEMFuelCell":
-        return "hydrogen", "electricity", "heat"
+        return "hydrogen", None, "electricity", "heat"
     if type == "PEMElectrolyzer":
-        return "electricity", "hydrogen", None
+        return "electricity", None, "hydrogen", None
     if type == "PressureStorage":
-        return "hydrogen", "hydrogen", None
+        return "hydrogen", None, "hydrogen", None
     raise KeyError
 
 changed_topologies = []
@@ -100,7 +100,7 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
                 connection_from = connections['from'][i]
                 connection_to = connections['to'][i]
                 from_type = components[connection_from]['type']
-                input_commodity, output_commodity_1, output_commodity_2 = component_to_commodities(from_type)
+                input_commodity_1, input_commodity_2, output_commodity_1, output_commodity_2 = component_to_commodities(from_type)
                 if commodity == output_commodity_1:
                     connections['output'][i] = "1"
                 elif commodity == output_commodity_2:
@@ -108,9 +108,11 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
                 else:
                     raise KeyError
                 to_type = components[connection_to]['type']
-                input_commodity, output_commodity_1, output_commodity_2 = component_to_commodities(to_type)
-                if commodity == input_commodity:
-                    connections['input'][i] = ""
+                input_commodity_1, input_commodity_2, output_commodity_1, output_commodity_2 = component_to_commodities(to_type)
+                if commodity == input_commodity_1:
+                    connections['input'][i] = "1"
+                elif commodity == input_commodity_2:
+                    connections['input'][i] = "2"
                 else:
                     raise KeyError
             connections.drop("sector", axis = 1)
diff --git a/input_files/models/district_models/example_CA/connections.csv b/input_files/models/district_models/example_CA/connections.csv
index 2221e07d38148b66823fc50c9e34dfe3d8f2c10d..460b1cd9c2881d454b8a33fe706d01636fd84dff 100644
--- a/input_files/models/district_models/example_CA/connections.csv
+++ b/input_files/models/district_models/example_CA/connections.csv
@@ -1,7 +1,7 @@
 from,output,to,input
-inv_pv_bat,1,battery,
-inv_pv_bat,1,grd,
-inv_pv_bat,1,elec_cns,
-battery,1,inv_pv_bat,
-grd,1,inv_pv_bat,
-grd,1,elec_cns,
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,elec_cns,1
diff --git a/input_files/models/district_models/example_community/connections.csv b/input_files/models/district_models/example_community/connections.csv
index 92ceec7f3297921688d1f3cc7e3a20492f1fb6ab..fced4f72023e4e4bc430aec80753671b0d5480e8 100644
--- a/input_files/models/district_models/example_community/connections.csv
+++ b/input_files/models/district_models/example_community/connections.csv
@@ -1,8 +1,8 @@
 from,output,to,input
-pv_roof,1,inv_pv_bat,
-inv_pv_bat,1,battery,
-inv_pv_bat,1,grd,
-inv_pv_bat,1,elec_cns,
-battery,1,inv_pv_bat,
-grd,1,inv_pv_bat,
-grd,1,elec_cns,
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,elec_cns,1
diff --git a/input_files/models/district_models/jbr_test_ca/connections.csv b/input_files/models/district_models/jbr_test_ca/connections.csv
index 92ceec7f3297921688d1f3cc7e3a20492f1fb6ab..fced4f72023e4e4bc430aec80753671b0d5480e8 100644
--- a/input_files/models/district_models/jbr_test_ca/connections.csv
+++ b/input_files/models/district_models/jbr_test_ca/connections.csv
@@ -1,8 +1,8 @@
 from,output,to,input
-pv_roof,1,inv_pv_bat,
-inv_pv_bat,1,battery,
-inv_pv_bat,1,grd,
-inv_pv_bat,1,elec_cns,
-battery,1,inv_pv_bat,
-grd,1,inv_pv_bat,
-grd,1,elec_cns,
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,elec_cns,1
diff --git a/input_files/models/district_models/jbr_test_comm/connections.csv b/input_files/models/district_models/jbr_test_comm/connections.csv
index 92ceec7f3297921688d1f3cc7e3a20492f1fb6ab..fced4f72023e4e4bc430aec80753671b0d5480e8 100644
--- a/input_files/models/district_models/jbr_test_comm/connections.csv
+++ b/input_files/models/district_models/jbr_test_comm/connections.csv
@@ -1,8 +1,8 @@
 from,output,to,input
-pv_roof,1,inv_pv_bat,
-inv_pv_bat,1,battery,
-inv_pv_bat,1,grd,
-inv_pv_bat,1,elec_cns,
-battery,1,inv_pv_bat,
-grd,1,inv_pv_bat,
-grd,1,elec_cns,
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
index 793bf1329f99e5e4a4aac1fa3ffa87caa752b7cb..dbfe4b050cf08b6c72a40bde54198c026cc687a8 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/connections.csv
@@ -1,8 +1,8 @@
 from,output,to,input
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
index 29bf9c9ef842275d59ed73c3d89b5b67d5cd30b2..29dd4e9de59d29d5045f4b11602ae54208ad6cfa 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/connections.csv
@@ -1,11 +1,11 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
index 80ceeebd58806ee3304437a3efb0562e7bffe15e..e1ac16fb043e46f95c946d86e111b51dfa2e3db1 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/connections.csv
@@ -1,17 +1,17 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,elec_cns,
-grd,1,inv_bat,
-inv_bat,1,battery,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
index 41209ff3aa614f9fef6b9bc7f9901a71efb8987c..b868a18efbd476fdfc3e68a7097cc7dcf0156dc8 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/connections.csv
@@ -1,22 +1,22 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,heat_pump,
-grd,1,elec_cns,
-inv_bat,1,battery,
-inv_bat,1,heat_pump,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+inv_bat,1,battery,1
+inv_bat,1,heat_pump,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
index b419198fc173c911a242c5f9aa51e67e323e9045..ceb46125766b01ae11f0dc18c82ac8034c8b2d9d 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/connections.csv
@@ -1,16 +1,16 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,heat_pump,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
index 29bf9c9ef842275d59ed73c3d89b5b67d5cd30b2..29dd4e9de59d29d5045f4b11602ae54208ad6cfa 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/connections.csv
@@ -1,11 +1,11 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
index f28a5c34352235965a2fcd6d92c07dd35a0cbd36..c459e9455f4378a562f9176f83648d0324e698c4 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/connections.csv
@@ -1,16 +1,16 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,elec_cns,
-inv_bat,1,battery,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,elec_cns,1
+inv_bat,1,battery,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
index 41209ff3aa614f9fef6b9bc7f9901a71efb8987c..b868a18efbd476fdfc3e68a7097cc7dcf0156dc8 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/connections.csv
@@ -1,22 +1,22 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,heat_pump,
-grd,1,elec_cns,
-inv_bat,1,battery,
-inv_bat,1,heat_pump,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+inv_bat,1,battery,1
+inv_bat,1,heat_pump,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
index b419198fc173c911a242c5f9aa51e67e323e9045..ceb46125766b01ae11f0dc18c82ac8034c8b2d9d 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/connections.csv
@@ -1,16 +1,16 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,heat_pump,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
index 793bf1329f99e5e4a4aac1fa3ffa87caa752b7cb..dbfe4b050cf08b6c72a40bde54198c026cc687a8 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/connections.csv
@@ -1,8 +1,8 @@
 from,output,to,input
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
index 29bf9c9ef842275d59ed73c3d89b5b67d5cd30b2..29dd4e9de59d29d5045f4b11602ae54208ad6cfa 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/connections.csv
@@ -1,11 +1,11 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
index 80ceeebd58806ee3304437a3efb0562e7bffe15e..e1ac16fb043e46f95c946d86e111b51dfa2e3db1 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/connections.csv
@@ -1,17 +1,17 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,elec_cns,
-grd,1,inv_bat,
-inv_bat,1,battery,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
index c3805591c367d90750a3906a366599c7d248862c..7e6ca7c5f888d21cc56e5a39d682ab8a54d26964 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/connections.csv
@@ -1,23 +1,23 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,heat_pump,
-grd,1,elec_cns,
-grd,1,inv_bat,
-inv_bat,1,battery,
-inv_bat,1,heat_pump,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,heat_pump,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
index b419198fc173c911a242c5f9aa51e67e323e9045..ceb46125766b01ae11f0dc18c82ac8034c8b2d9d 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/connections.csv
@@ -1,16 +1,16 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,heat_pump,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
index 29bf9c9ef842275d59ed73c3d89b5b67d5cd30b2..29dd4e9de59d29d5045f4b11602ae54208ad6cfa 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/connections.csv
@@ -1,11 +1,11 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
index 80ceeebd58806ee3304437a3efb0562e7bffe15e..e1ac16fb043e46f95c946d86e111b51dfa2e3db1 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/connections.csv
@@ -1,17 +1,17 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,elec_cns,
-grd,1,inv_bat,
-inv_bat,1,battery,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
index c3805591c367d90750a3906a366599c7d248862c..7e6ca7c5f888d21cc56e5a39d682ab8a54d26964 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/connections.csv
@@ -1,23 +1,23 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-inv_pv,1,inv_bat,
-battery,1,inv_bat,
-grd,1,heat_pump,
-grd,1,elec_cns,
-grd,1,inv_bat,
-inv_bat,1,battery,
-inv_bat,1,heat_pump,
-inv_bat,1,grd,
-inv_bat,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+inv_pv,1,inv_bat,1
+battery,1,inv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+grd,1,inv_bat,1
+inv_bat,1,battery,1
+inv_bat,1,heat_pump,1
+inv_bat,1,grd,1
+inv_bat,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
index b419198fc173c911a242c5f9aa51e67e323e9045..ceb46125766b01ae11f0dc18c82ac8034c8b2d9d 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/connections.csv
@@ -1,16 +1,16 @@
 from,output,to,input
-pv_roof,1,inv_pv,
-inv_pv,1,heat_pump,
-inv_pv,1,grd,
-inv_pv,1,elec_cns,
-grd,1,heat_pump,
-grd,1,elec_cns,
-gas_grd,1,gas_boi,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-gas_boi,1,water_tes,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
-gas_boi,1,therm_cns,
-gas_boi,1,dhw_dmd,
+pv_roof,1,inv_pv,1
+inv_pv,1,heat_pump,1
+inv_pv,1,grd,1
+inv_pv,1,elec_cns,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+gas_grd,1,gas_boi,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+gas_boi,1,water_tes,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1
+gas_boi,1,therm_cns,1
+gas_boi,1,dhw_dmd,1
diff --git a/input_files/models/prosumer_models/jbr_test/connections.csv b/input_files/models/prosumer_models/jbr_test/connections.csv
index 92ceec7f3297921688d1f3cc7e3a20492f1fb6ab..fced4f72023e4e4bc430aec80753671b0d5480e8 100644
--- a/input_files/models/prosumer_models/jbr_test/connections.csv
+++ b/input_files/models/prosumer_models/jbr_test/connections.csv
@@ -1,8 +1,8 @@
 from,output,to,input
-pv_roof,1,inv_pv_bat,
-inv_pv_bat,1,battery,
-inv_pv_bat,1,grd,
-inv_pv_bat,1,elec_cns,
-battery,1,inv_pv_bat,
-grd,1,inv_pv_bat,
-grd,1,elec_cns,
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,elec_cns,1
diff --git a/input_files/models/prosumer_models/mfh_quartal/connections.csv b/input_files/models/prosumer_models/mfh_quartal/connections.csv
index 6bbcae822124c310fc58d2d9d02cea28525afed1..0416b8eae930a195328ae32c779d86790430738a 100644
--- a/input_files/models/prosumer_models/mfh_quartal/connections.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/connections.csv
@@ -1,35 +1,35 @@
 from,output,to,input
-grd,1,ecns1,
-grd,1,ecns2,
-grd,1,ecns3,
-grd,1,ecns4,
-grd,1,ecns5,
-grd,1,ecns6,
-pv,1,grd,
-pv,1,bat,
-pv,1,ecns1,
-pv,1,ecns2,
-pv,1,ecns3,
-pv,1,ecns4,
-pv,1,ecns5,
-pv,1,ecns6,
-bat,1,ecns1,
-bat,1,ecns2,
-bat,1,ecns3,
-bat,1,ecns4,
-bat,1,ecns5,
-bat,1,ecns6,
-chp,2,grd,
-chp,2,ecns1,
-chp,2,ecns2,
-chp,2,ecns3,
-chp,2,ecns4,
-chp,2,ecns5,
-chp,2,ecns6,
-gas_grd,1,chp,
-chp,1,tcns1,
-chp,1,tcns2,
-chp,1,tcns3,
-chp,1,tcns4,
-chp,1,tcns5,
-chp,1,tcns6,
+grd,1,ecns1,1
+grd,1,ecns2,1
+grd,1,ecns3,1
+grd,1,ecns4,1
+grd,1,ecns5,1
+grd,1,ecns6,1
+pv,1,grd,1
+pv,1,bat,1
+pv,1,ecns1,1
+pv,1,ecns2,1
+pv,1,ecns3,1
+pv,1,ecns4,1
+pv,1,ecns5,1
+pv,1,ecns6,1
+bat,1,ecns1,1
+bat,1,ecns2,1
+bat,1,ecns3,1
+bat,1,ecns4,1
+bat,1,ecns5,1
+bat,1,ecns6,1
+chp,2,grd,1
+chp,2,ecns1,1
+chp,2,ecns2,1
+chp,2,ecns3,1
+chp,2,ecns4,1
+chp,2,ecns5,1
+chp,2,ecns6,1
+gas_grd,1,chp,1
+chp,1,tcns1,1
+chp,1,tcns2,1
+chp,1,tcns3,1
+chp,1,tcns4,1
+chp,1,tcns5,1
+chp,1,tcns6,1
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
index 1e8111f230f2e7f2da8cf79657b1da83f0b547be..84ee2b5bdfe592ebadd5f1eba58fb2b8edea8a5d 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/connections.csv
@@ -1,15 +1,15 @@
 from,output,to,input
-pv_roof,1,inv_pv_bat,
-inv_pv_bat,1,battery,
-inv_pv_bat,1,heat_pump,
-inv_pv_bat,1,grd,
-inv_pv_bat,1,elec_cns,
-battery,1,inv_pv_bat,
-grd,1,inv_pv_bat,
-grd,1,heat_pump,
-grd,1,elec_cns,
-heat_pump,1,water_tes,
-water_tes,1,therm_cns,
-water_tes,1,dhw_dmd,
-heat_pump,1,therm_cns,
-heat_pump,1,dhw_dmd,
+pv_roof,1,inv_pv_bat,1
+inv_pv_bat,1,battery,1
+inv_pv_bat,1,heat_pump,1
+inv_pv_bat,1,grd,1
+inv_pv_bat,1,elec_cns,1
+battery,1,inv_pv_bat,1
+grd,1,inv_pv_bat,1
+grd,1,heat_pump,1
+grd,1,elec_cns,1
+heat_pump,1,water_tes,1
+water_tes,1,therm_cns,1
+water_tes,1,dhw_dmd,1
+heat_pump,1,therm_cns,1
+heat_pump,1,dhw_dmd,1