diff --git a/Model_Library b/Model_Library
index 45ee9ad75756f37ecddd11dee4902c97bb590bbb..d1e391b64ee8d8437d1f8d65f93cb35af638a740 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 45ee9ad75756f37ecddd11dee4902c97bb590bbb
+Subproject commit d1e391b64ee8d8437d1f8d65f93cb35af638a740
diff --git a/Tooling b/Tooling
index d7e201c3af6d28b04300dbf3c6fca4900852dc10..7429265e5642c02c9dd79efd5e595698edf81d7b 160000
--- a/Tooling
+++ b/Tooling
@@ -1 +1 @@
-Subproject commit d7e201c3af6d28b04300dbf3c6fca4900852dc10
+Subproject commit 7429265e5642c02c9dd79efd5e595698edf81d7b
diff --git a/runme_community.py b/runme_community.py
index dc08d90d80fb58d4efa5cb81b59c7b3f0ba6b1c8..910280e46b8e1e9c3314adc2fe5676332f6555d7 100644
--- a/runme_community.py
+++ b/runme_community.py
@@ -48,26 +48,17 @@ input_profiles = Tooling.input_profile_processor.input_profile_processor.process
 after_input_processing = time.time()
 print("runme:\t\t\tProfile Processing [s]: \t" + str(after_input_processing - start))
 
-# 'data_path': path to file specifying where input profiles are located
-# 'topology_path': path to matrices that define the prosumer topology
+# 'topology_path': path to directory that contains the matrices that define the prosumer topology
 # 'config_path': path to global configurations like prices, injection prices, emission costs, etc.
-prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'elec_demand': 3000,
-                                             'therm_demand': 6000,
-                                             'hot_water_demand': 1500,
-                                             'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11',
+prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11',
                                              'config_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv',
-                                             'data_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/data_path.csv',
                                              'profiles': {'irradiance': 'irradiance_1',
                                                           'air_temperature': 'temperature_1',
                                                           'elec_demand': 'demand_electric_1',
                                                           'therm_demand': 'demand_heat_1',
                                                           'hot_water_demand': 'demand_hot_water_1'}},
-                 'SCN0_CAT1_3000_6000': {'elec_demand': 3000,
-                                         'therm_demand': 6000,
-                                         'hot_water_demand': 1500,
-                                         'topology_path': 'input_files/models/prosumer_models/SCN0_CAT1',
+                 'SCN0_CAT1_3000_6000': {'topology_path': 'input_files/models/prosumer_models/SCN0_CAT1',
                                          'config_path': 'input_files/models/prosumer_models/SCN0_CAT1/config.csv',
-                                         'data_path': 'input_files/models/prosumer_models/SCN0_CAT1/data_path.csv',
                                          'profiles': {'irradiance': 'irradiance_2',
                                                       'air_temperature': 'temperature_2',
                                                       'elec_demand': 'demand_electric_2',
@@ -95,12 +86,8 @@ print("runme:\t\t\tProsumer Optimization [s]: \t" + str(after_optimization - bef
 
 start_community = time.time()
 
-ca_dict = {'ca_bat': {'elec_demand': 0,
-                      'therm_demand': 0,
-                      'hot_water_demand': 0,
-                      'topology_path': 'input_files/models/district_models/example_CA',
+ca_dict = {'ca_bat': {'topology_path': 'input_files/models/district_models/example_CA',
                       'config_path': 'input_files/models/district_models/example_CA/config.csv',
-                      'data_path': 'input_files/models/district_models/example_CA/data_path.csv',
                       'profiles': {'irradiance': 'irradiance_3',
                                    'air_temperature': 'temperature_3',
                                    'elec_demand': 'demand_electric_3',
@@ -115,9 +102,7 @@ comm_assets = main.Main_CA(ca_dict, t_start, t_horizon, t_step, input_profiles)
 after_community_assets = time.time()
 print("runme:\t\t\tCommunity Assets Constr. [s]: \t" + str(after_community_assets - before_community_assets))
 
-comm_dict = {'community': {'topology_path': 'input_files/models/district_models/example_community',
-                           'config_path': 'input_files/models/district_models/example_community/config.csv',
-                           'data_path': 'input_files/models/district_models/example_community/data_path.csv',
+comm_dict = {'community': {'config_path': 'input_files/models/district_models/example_community/config.csv',
                            'profiles': {'elec_price': 'elec_price_1'}}}
 
 comm_strategy = ['max_operational_profit']