diff --git a/Model_Library b/Model_Library
index 81281690d25e4c8d8e3eca55cb9bcb63edd76a7b..09f026c22cca6060b606e9cd33483bea01ba59d3 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 81281690d25e4c8d8e3eca55cb9bcb63edd76a7b
+Subproject commit 09f026c22cca6060b606e9cd33483bea01ba59d3
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index 04945a1d20285475747a395ed154ed701520de77..14959bbf7942f94245f894e9b58ae1d66be12f17 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -55,7 +55,9 @@ renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption',
                       'StandardPVGenerator': 'PVGenerator',
                       'StandardGasGrid': 'GasGrid',
                       'StandardPEMElectrolyzer': 'PEMElectrolyzer',
-                      'StandardPEMFuelCell': 'PEMFuelCell'}
+                      'StandardPEMFuelCell': 'PEMFuelCell',
+                      'BasicInverter': 'StaticInverter',
+                      'Inverter': 'DynamicInverter'}
 consumption_components = ['CoolConsumption', 'ChargingInfrastructure', 'ElectricalConsumption', 'HeatConsumption', 'Radiator', 'HotWaterConsumption']
 for dirpath, dirnames, filenames in os.walk(".\\input_files"):
     topology_here = False
diff --git a/input_files/models/district_models/example_CA/components.csv b/input_files/models/district_models/example_CA/components.csv
index 671c3e165f474c7a6a0b3c75d656462152b921f7..28ea34b9061bdec4e1f06d4668a57954403666fd 100644
--- a/input_files/models/district_models/example_CA/components.csv
+++ b/input_files/models/district_models/example_CA/components.csv
@@ -1,5 +1,5 @@
 name,type,model,min_size,max_size,current_size
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,0,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
 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 84edca4c2ecdb351206ef05ea7d706279c4a53d8..37d9f6061ca4764e7bcaa126e41fd261232c7987 100644
--- a/input_files/models/district_models/example_community/components.csv
+++ b/input_files/models/district_models/example_community/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
 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 84edca4c2ecdb351206ef05ea7d706279c4a53d8..37d9f6061ca4764e7bcaa126e41fd261232c7987 100644
--- a/input_files/models/district_models/jbr_test_ca/components.csv
+++ b/input_files/models/district_models/jbr_test_ca/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
 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 84edca4c2ecdb351206ef05ea7d706279c4a53d8..37d9f6061ca4764e7bcaa126e41fd261232c7987 100644
--- a/input_files/models/district_models/jbr_test_comm/components.csv
+++ b/input_files/models/district_models/jbr_test_comm/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
 elec_cns,ElectricalConsumption,,,,
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 c37533c1723118c5d8bc0c6ae39dbe06ac726d4c..89ba5854d920853fd65b5dedcefc8ceaa68bb96e 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,INVPV,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,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 ef3503325d4a75d8218bb330a660b0b73563054a..3bc6ffd4d5e474a3cd06e5666ee77c3178d585df 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
@@ -1,10 +1,10 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 3de8e7db96b7c89824a844a63f793ab25e35fe2f..adc049d34ca2c07024af58442933121308f35ce8 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
@@ -1,11 +1,11 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,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,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 70b95184257b25fa364a7b32e41398b04b24d27c..9029b25baae027b0647d832fcbd6b366bc223adf 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
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
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 55511dd6cbea0126f7a91b9250752b8c75e23c2d..9583700cc096e077fbe82b9713e3624a46118ad6 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,INVPV,30,30,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,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 86be551e1b3623c0a2e9ea62be1ca2cc4357482b..2af6381b45c68135d301b15526c69eed1bb21463 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
@@ -1,10 +1,10 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 68d9cb21b3845b7e7e4500faabcc55b8f4bb6552..445b0bafbb208ee238800315db8d2b1bbad28c3d 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
@@ -1,11 +1,11 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,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,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 c2bfab8aeef32ed6ca91c293ef5855875aa239f0..cb554db40cc7d0b7e8daa228b2cb82b9e6367876 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
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
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 c37533c1723118c5d8bc0c6ae39dbe06ac726d4c..89ba5854d920853fd65b5dedcefc8ceaa68bb96e 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,INVPV,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,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 ef3503325d4a75d8218bb330a660b0b73563054a..3bc6ffd4d5e474a3cd06e5666ee77c3178d585df 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
@@ -1,10 +1,10 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,INVPV,10,10,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 3de8e7db96b7c89824a844a63f793ab25e35fe2f..adc049d34ca2c07024af58442933121308f35ce8 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
@@ -1,11 +1,11 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,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,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 70b95184257b25fa364a7b32e41398b04b24d27c..9029b25baae027b0647d832fcbd6b366bc223adf 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
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,10,10,0
-inv_pv,BasicInverter,INVPV,10,10,0
+inv_pv,StaticInverter,INVPV,10,10,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
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 55511dd6cbea0126f7a91b9250752b8c75e23c2d..9583700cc096e077fbe82b9713e3624a46118ad6 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,INVPV,30,30,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
 gas_boi,GasBoiler,BOI1,10,10,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 86be551e1b3623c0a2e9ea62be1ca2cc4357482b..2af6381b45c68135d301b15526c69eed1bb21463 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
@@ -1,10 +1,10 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,INVPV,30,30,0
 battery,LiionBattery,BAT1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 68d9cb21b3845b7e7e4500faabcc55b8f4bb6552..445b0bafbb208ee238800315db8d2b1bbad28c3d 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
@@ -1,11 +1,11 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,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,,,,
-inv_bat,BasicInverter,INVBAT,10,10,0
+inv_bat,StaticInverter,INVBAT,10,10,0
 gas_boi,GasBoiler,BOI1,10,10,0
 gas_grd,GasGrid,GAS1,10000,10000,0
 therm_cns,HeatConsumption,,,,
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 c2bfab8aeef32ed6ca91c293ef5855875aa239f0..cb554db40cc7d0b7e8daa228b2cb82b9e6367876 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
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,30,30,0
-inv_pv,BasicInverter,INVPV,30,30,0
+inv_pv,StaticInverter,INVPV,30,30,0
 heat_pump,HeatPump,EHP1,10,10,0
 grd,ElectricalGrid,GRD1,10000,10000,0
 elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/jbr_test/components.csv b/input_files/models/prosumer_models/jbr_test/components.csv
index 84edca4c2ecdb351206ef05ea7d706279c4a53d8..37d9f6061ca4764e7bcaa126e41fd261232c7987 100644
--- a/input_files/models/prosumer_models/jbr_test/components.csv
+++ b/input_files/models/prosumer_models/jbr_test/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,6,6,6
-inv_pv_bat,Inverter,STP-7000TL-20,0,20,0
+inv_pv_bat,DynamicInverter,STP-7000TL-20,0,20,0
 battery,LiionBattery,BAT1,6,6,6
 grd,ElectricalGrid,GRD1,1000,1000,1000
 elec_cns,ElectricalConsumption,,,,
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 c80d58e8f2145d143a588c36c485278088de7241..56d0504c8089561606e81f7403d429ab8b31fad8 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/components.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/components.csv
@@ -1,6 +1,6 @@
 name,type,model,min_size,max_size,current_size
 pv_roof,PVGenerator,PV2,0,30,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,30,0
+inv_pv_bat,DynamicInverter,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