diff --git a/Model_Library b/Model_Library
index 6f798f19e4095635839390f04a72e87343657140..6dadedf53098caad20ccadebdd8b67aa312cbf62 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 6f798f19e4095635839390f04a72e87343657140
+Subproject commit 6dadedf53098caad20ccadebdd8b67aa312cbf62
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index b503d4fec0d8e9c614609558026e67c67f7fcbac..b275486e2db694f206d43619ba58c1c6ebe35db5 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -48,6 +48,7 @@ renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption',
                       'StandardGasGrid': 'GasGrid',
                       'StandardPEMElectrolyzer': 'PEMElectrolyzer',
                       'StandardPEMFuelCell': 'PEMFuelCell'}
+consumption_components = ['CoolConsumption', 'ChargingInfrastructure', 'ElectricalConsumption', 'HeatConsumption', 'Radiator', 'HotWaterConsumption']
 for dirpath, dirnames, filenames in os.walk(".\\input_files"):
     topology_here = False
     matrix_files = []
@@ -73,6 +74,11 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
                 for i in df.index:
                     if df['comp_type'][i] in renamed_components:
                         df.loc[i, 'comp_type'] = renamed_components[df['comp_type'][i]]
+                    if df['comp_type'][i] in consumption_components:
+                        df.loc[i, 'model'] = ''
+                        df.loc[i, 'min_size'] = ''
+                        df.loc[i, 'max_size'] = ''
+                        df.loc[i, 'current_size'] = ''
                 file_contents.append((df, read_matrix(df), read_components(df), sector))
             all_components = pd.DataFrame(columns = ['comp_name', 'comp_type', 'model', 'min_size', 'max_size', 'current_size'])
             all_connections = pd.DataFrame(columns = ['sector', 'comp_from', 'comp_to'])
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
index f2359fffa80bdeb4ff32a70b94d71a2cc4089acb..9fe473ac8975d9a77d5d36c613d744af62b3da64 100644
--- a/input_files/models/district_models/example_CA/components.csv
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -2,4 +2,4 @@ comp_name,comp_type,model,min_size,max_size,current_size
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,0,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/district_models/example_community/components.csv b/input_files/models/district_models/example_community/components.csv
index 2d1c6e8aad7c0468cde36deae28adc3ce0082161..096d2a289da0f5201cf1256f2ad2f43566c65097 100644
--- a/input_files/models/district_models/example_community/components.csv
+++ b/input_files/models/district_models/example_community/components.csv
@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/district_models/jbr_test_ca/components.csv b/input_files/models/district_models/jbr_test_ca/components.csv
index 2d1c6e8aad7c0468cde36deae28adc3ce0082161..096d2a289da0f5201cf1256f2ad2f43566c65097 100644
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/district_models/jbr_test_comm/components.csv b/input_files/models/district_models/jbr_test_comm/components.csv
index 2d1c6e8aad7c0468cde36deae28adc3ce0082161..096d2a289da0f5201cf1256f2ad2f43566c65097 100644
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/components.csv b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
index 1c030fff8a6893b987f884da7aff2b85a2641957..414d23a3d277087c6196cde35046409b17abee8d 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/components.csv
@@ -1,8 +1,8 @@
 comp_name,comp_type,model,min_size,max_size,current_size
 grd,ElectricalGrid,GRD1,100000,100000,0
-elec_cns,ElectricalConsumption,CNS1,100000,100000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,100000,100000,0
-therm_cns,HeatConsumption,HeatCNS1,100000,100000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,100000,100000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4994866b662b73ac82005b1e8854ca09b78cdb3d
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,30,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a1324858b8799a58af83fa26ecd5c01e4ccbd6cb
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,grd,elec_cns
+electricity,pv_roof,grd
+electricity,pv_roof,elec_cns
+electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv
deleted file mode 100644
index 31ab298b041e213b0c0f069e2b7e70bafd1b3214..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv	
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv
deleted file mode 100644
index 182920b085884b5bee3c23ca657b90b6aa60e0ce..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
index f095bd6247e3119826b07252a3075f600c8b3a5c..848c34e1cb5d554fa27c1c9842552e7e6324839d 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -2,9 +2,9 @@ comp_name,comp_type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
index 8c0f5b5cf11f45c2cb7a57714899a9e5834310df..35107aae587927960244b94d1e2d45506e6e2d73 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/components.csv
@@ -3,10 +3,10 @@ pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
index 1df0ef85a0d70f66e1c0972dc24f962a64fc4e71..7899fb7b2ddc77b63dd651e211cc49146482c2ad 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/components.csv
@@ -4,10 +4,10 @@ inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
index f034df24068c9c9623b2943d1a6bdd7dc4a0b899..aa296a9117273319e70db093cb960a1a4632098e 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/components.csv
@@ -3,9 +3,9 @@ pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4994866b662b73ac82005b1e8854ca09b78cdb3d
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,30,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a1324858b8799a58af83fa26ecd5c01e4ccbd6cb
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,grd,elec_cns
+electricity,pv_roof,grd
+electricity,pv_roof,elec_cns
+electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv
deleted file mode 100644
index 31ab298b041e213b0c0f069e2b7e70bafd1b3214..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv	
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv
deleted file mode 100644
index 182920b085884b5bee3c23ca657b90b6aa60e0ce..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
index 6049ee2dee8b030b50b24d0fd15f4688bf04f4ea..e7979a690de8f51d1b71537995727cccbeba443d 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -2,9 +2,9 @@ comp_name,comp_type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
index c2a219964dec397d31a04b62ecadf6abac4bb884..31d8fe9d70f823fd4fa56651cb1ad3d9f1200695 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/components.csv
@@ -3,10 +3,10 @@ pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
index 8c18d7785181e264c54004663845edd7175e2b3c..5081af0d495be86e410ad75c6980180af2befa1f 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/components.csv
@@ -4,10 +4,10 @@ inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
index aa67ccf8aa526986e8903f30111c8574ff16b36f..aabb7a8e8eccdbb8b307f3185a4a4085d1c705dd 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/components.csv
@@ -3,9 +3,9 @@ pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/components.csv b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
index 218cb0b16974eece8e1fb96e5f46999e285b2dda..6afe7f36819a5386098737f54a4e8d31bb7569e4 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/components.csv
@@ -1,8 +1,8 @@
 comp_name,comp_type,model,min_size,max_size,current_size
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/components.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4994866b662b73ac82005b1e8854ca09b78cdb3d
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/components.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,30,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/connections.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a1324858b8799a58af83fa26ecd5c01e4ccbd6cb
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,grd,elec_cns
+electricity,pv_roof,grd
+electricity,pv_roof,elec_cns
+electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix - Kopie.csv
deleted file mode 100644
index 31ab298b041e213b0c0f069e2b7e70bafd1b3214..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix - Kopie.csv	
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix.csv
deleted file mode 100644
index 182920b085884b5bee3c23ca657b90b6aa60e0ce..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
index f095bd6247e3119826b07252a3075f600c8b3a5c..848c34e1cb5d554fa27c1c9842552e7e6324839d 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -2,9 +2,9 @@ comp_name,comp_type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
index 8c0f5b5cf11f45c2cb7a57714899a9e5834310df..35107aae587927960244b94d1e2d45506e6e2d73 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/components.csv
@@ -3,10 +3,10 @@ pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
index 1df0ef85a0d70f66e1c0972dc24f962a64fc4e71..7899fb7b2ddc77b63dd651e211cc49146482c2ad 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/components.csv
@@ -4,10 +4,10 @@ inv_pv,BasicInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
index f034df24068c9c9623b2943d1a6bdd7dc4a0b899..aa296a9117273319e70db093cb960a1a4632098e 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/components.csv
@@ -3,9 +3,9 @@ pv_roof,PVGenerator,PV2,10,10,0
 inv_pv,BasicInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/components.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4994866b662b73ac82005b1e8854ca09b78cdb3d
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/components.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size
+pv_roof,PVGenerator,PV2,30,30,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
+grd,ElectricalGrid,GRD1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/connections.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a1324858b8799a58af83fa26ecd5c01e4ccbd6cb
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/connections.csv
@@ -0,0 +1,8 @@
+sector,comp_from,comp_to
+electricity,pv_roof,inv_pv_bat
+electricity,inv_pv_bat,grd
+electricity,inv_pv_bat,elec_cns
+electricity,grd,elec_cns
+electricity,pv_roof,grd
+electricity,pv_roof,elec_cns
+electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix - Kopie.csv
deleted file mode 100644
index 31ab298b041e213b0c0f069e2b7e70bafd1b3214..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix - Kopie.csv	
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix.csv
deleted file mode 100644
index 182920b085884b5bee3c23ca657b90b6aa60e0ce..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
-pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
-grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
-elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
index 6049ee2dee8b030b50b24d0fd15f4688bf04f4ea..e7979a690de8f51d1b71537995727cccbeba443d 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -2,9 +2,9 @@ comp_name,comp_type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
index c2a219964dec397d31a04b62ecadf6abac4bb884..31d8fe9d70f823fd4fa56651cb1ad3d9f1200695 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/components.csv
@@ -3,10 +3,10 @@ pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,10000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
index 8c18d7785181e264c54004663845edd7175e2b3c..5081af0d495be86e410ad75c6980180af2befa1f 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/components.csv
@@ -4,10 +4,10 @@ inv_pv,BasicInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 inv_bat,BasicInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
index aa67ccf8aa526986e8903f30111c8574ff16b36f..aabb7a8e8eccdbb8b307f3185a4a4085d1c705dd 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/components.csv
@@ -3,9 +3,9 @@ pv_roof,PVGenerator,PV2,30,30,0
 inv_pv,BasicInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
-elec_cns,ElectricalConsumption,CNS1,10000,10000,0
+elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
-therm_cns,HeatConsumption,HeatCNS1,10000,1000000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,10000,10000,0
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,40,40,0
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
index 2d1c6e8aad7c0468cde36deae28adc3ce0082161..096d2a289da0f5201cf1256f2ad2f43566c65097 100644
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -3,4 +3,4 @@ pv_roof,PVGenerator,PV2,6,6,6
 inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/mfh_quartal/components.csv b/input_files/models/prosumer_models/mfh_quartal/components.csv
index b30751744e790015fe95198df446b72f812f522f..1697b9bb1bc82291dcfebfef1cd0369fcc91c04c 100644
--- a/input_files/models/prosumer_models/mfh_quartal/components.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/components.csv
@@ -3,16 +3,16 @@ grd,ElectricalGrid,GRD1,1000,1000,0
 pv,PVGenerator,PV2,0,30,0
 bat,LiionBattery,BAT1,1,1,0
 chp,CHP,CHP1,0,50,0
-ecns1,ElectricalConsumption,CNS1,1000,1000,0
-ecns2,ElectricalConsumption,CNS1,1000,1000,0
-ecns3,ElectricalConsumption,CNS1,1000,1000,0
-ecns4,ElectricalConsumption,CNS1,1000,1000,0
-ecns5,ElectricalConsumption,CNS1,1000,1000,0
-ecns6,ElectricalConsumption,CNS1,1000,1000,0
+ecns1,ElectricalConsumption,,,,
+ecns2,ElectricalConsumption,,,,
+ecns3,ElectricalConsumption,,,,
+ecns4,ElectricalConsumption,,,,
+ecns5,ElectricalConsumption,,,,
+ecns6,ElectricalConsumption,,,,
 gas_grd,GasGrid,GAS1,1000,1000,0
-tcns1,HeatConsumption,HeatCNS1,1000,1000,0
-tcns2,HeatConsumption,HeatCNS1,1000,1000,0
-tcns3,HeatConsumption,HeatCNS1,1000,1000,0
-tcns4,HeatConsumption,HeatCNS1,1000,1000,0
-tcns5,HeatConsumption,HeatCNS1,1000,1000,0
-tcns6,HeatConsumption,HeatCNS1,1000,1000,0
+tcns1,HeatConsumption,,,,
+tcns2,HeatConsumption,,,,
+tcns3,HeatConsumption,,,,
+tcns4,HeatConsumption,,,,
+tcns5,HeatConsumption,,,,
+tcns6,HeatConsumption,,,,
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/components.csv b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
index 4d63c58da575a6941be33ad0f157f0b657ad4189..8b68ad82cf0f0af43a36343574167da857ed0bda 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -4,7 +4,7 @@ inv_pv_bat,Inverter,STP-7000TL-20,0,30,0
 battery,LiionBattery,BAT1,0,1000,0
 heat_pump,HeatPump,EHP1,2,50,0
 grd,ElectricalGrid,GRD1,1000,1000,0
-elec_cns,ElectricalConsumption,CNS1,1000,1000,0
-therm_cns,HeatConsumption,HeatCNS1,1000,1000,0
-dhw_dmd,HotWaterConsumption,HWCNS1,1000,1000,0
+elec_cns,ElectricalConsumption,,,,
+therm_cns,HeatConsumption,,,,
+dhw_dmd,HotWaterConsumption,,,,
 water_tes,HotWaterStorage,TES1,10,93,0
diff --git a/input_files/models/prosumer_models/swimmingPool/components.csv b/input_files/models/prosumer_models/swimmingPool/components.csv
index 7b5fde2aa2ca111a6bfca63b31a869203bbe6dae..3a8115f5a4faf01605072bf829dea826f665aaa0 100644
--- a/input_files/models/prosumer_models/swimmingPool/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool/components.csv
@@ -3,13 +3,13 @@ pv_roof1,PVGenerator,Vitovolt300,0,800,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
 battery,LiionBattery,BAT1,0,800,0
 grd,ElectricalGrid,GRD1,0,800,0
-elec_cns,ElectricalConsumption,CNS1,0,800,0
+elec_cns,ElectricalConsumption,,,,
 bhkw,BHKW,VTB200,0,800,0
 pv_roof2,PVGenerator,Vitovolt300,0,30,0
 heat_pump,HeatPump,EHP1,0,800,0
 gas_grd,GasGrid,GAS1,0,800,0
 gas_boiler,GasBoiler,BOI1,,,
-therm_cns,HeatConsumption,HeatCNS1,0,800,0
+therm_cns,HeatConsumption,,,,
 water_tes,HotWaterStorage,TES1,0,800,0
 heat_grid,HeatGrid,HG1,0,800,0
 solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
index 58c753ea68ca38efaee52e060ee2d38370b145d9..afea1e36833de1afa5a568897c9138d3a9f68586 100644
--- a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
@@ -3,12 +3,12 @@ pv_roof1,PVGenerator,Vitovolt300,0,800,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
 battery,LiionBattery,BAT1,0,800,0
 grd,ElectricalGrid,GRD1,0,800,0
-elec_cns,ElectricalConsumption,CNS1,0,800,0
+elec_cns,ElectricalConsumption,,,,
 bhkw,BHKW,VTB200,0,800,0
 pv_roof2,PVGenerator,Vitovolt300,0,30,0
 gas_grd,GasGrid,GAS1,0,800,0
 gas_boild,GasBoiler,BOI1,,,
-therm_cns,HeatConsumption,HeatCNS1,0,800,0
+therm_cns,HeatConsumption,,,,
 water_tes,HotWaterStorage,TES1,0,800,0
 heat_grid,HeatGrid,HG1,0,800,0
 solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/components.csv b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
index bb76935686dd24a8a7c7adadf263d9e326399a8f..b59c54999aa01b802434a16e226954a268b41901 100644
--- a/input_files/models/prosumer_models/swimmingPool_HP/components.csv
+++ b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
@@ -3,12 +3,12 @@ pv_roof1,PVGenerator,Vitovolt300,0,800,0
 inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
 battery,LiionBattery,BAT1,0,800,0
 grd,ElectricalGrid,GRD1,0,800,0
-elec_cns,ElectricalConsumption,CNS1,0,800,0
+elec_cns,ElectricalConsumption,,,,
 heat_pump,HeatPump,EHP1,0,800,0
 pv_roof2,PVGenerator,Vitovolt300,0,800,0
 gas_boild,GasBoiler,BOI1,,,
 gas_grd,GasGrid,GAS1,0,800,0
-therm_cns,HeatConsumption,HeatCNS1,0,800,0
+therm_cns,HeatConsumption,,,,
 water_tes,HotWaterStorage,TES1,0,800,0
 solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
 heat_grid,HeatGrid,HG1,0,800,0