diff --git a/energy_system_modelling_package/energy_system_modelling_factories/archetypes/montreal/archetype_cluster_1.py b/energy_system_modelling_package/energy_system_modelling_factories/archetypes/montreal/archetype_cluster_1.py
index 98f014b6..e66140d8 100644
--- a/energy_system_modelling_package/energy_system_modelling_factories/archetypes/montreal/archetype_cluster_1.py
+++ b/energy_system_modelling_package/energy_system_modelling_factories/archetypes/montreal/archetype_cluster_1.py
@@ -55,7 +55,7 @@ class ArchetypeCluster1:
     return results, building_heating_hourly_consumption
 
   def cooling_system_simulation(self):
-    hp = self.building.energy_systems[1].generation_systems[1]
+    hp = self.building.energy_systems[2].generation_systems[0]
     cooling_demand_joules = self.building.cooling_demand[cte.HOUR]
     cooling_peak_load = self.building.cooling_peak_load[cte.YEAR][0]
     cutoff_temperature = 11
@@ -71,8 +71,8 @@ class ArchetypeCluster1:
 
   def dhw_system_simulation(self):
     building_dhw_hourly_consumption = []
-    hp = self.building.energy_systems[2].generation_systems[0]
-    tes = self.building.energy_systems[2].generation_systems[0].energy_storage_systems[0]
+    hp = self.building.energy_systems[-1].generation_systems[0]
+    tes = self.building.energy_systems[-1].generation_systems[0].energy_storage_systems[0]
     dhw_demand_joules = self.building.domestic_hot_water_heat_demand[cte.HOUR]
     upper_limit_tes = 65
     outdoor_temperature = self.building.external_temperature[cte.HOUR]
diff --git a/energy_system_modelling_package/random_assignation.py b/energy_system_modelling_package/random_assignation.py
index 390a0948..605def1c 100644
--- a/energy_system_modelling_package/random_assignation.py
+++ b/energy_system_modelling_package/random_assignation.py
@@ -29,18 +29,20 @@ residential_systems_percentage = {'system 1 gas': 15,
                                   'system 8 electricity': 35}
 
 residential_new_systems_percentage = {
-    'Central 4 Pipes Air to Water Heat Pump and Gas Boiler with Independent Water Heating and PV': 100,
-    'Central 4 Pipes Air to Water Heat Pump and electrical Boiler with Independent Water Heating and PV': 0,
-    'Central 4 Pipes Ground to Water Heat Pump and Gas Boiler with Independent Water Heating and PV': 0,
-    'Central 4 Pipes Ground to Water Heat Pump and electrical Boiler with Independent Water Heating and PV': 0,
-    'Central 4 Pipes Water to Water Heat Pump and Gas Boiler with Independent Water Heating and PV': 0,
-    'Central 4 Pipes Water to Water Heat Pump and electrical Boiler with Independent Water Heating and PV': 0,
-    'Central 4 Pipes Air to Water Heat Pump and Gas Boiler with Independent Water Heating': 0,
-    'Central 4 Pipes Air to Water Heat Pump and electrical Boiler with Independent Water Heating': 0,
-    'Central 4 Pipes Ground to Water Heat Pump and Gas Boiler with Independent Water Heating': 0,
-    'Central 4 Pipes Ground to Water Heat Pump and electrical Boiler with Independent Water Heating': 0,
-    'Central 4 Pipes Water to Water Heat Pump and Gas Boiler with Independent Water Heating': 0,
-    'Central 4 Pipes Water to Water Heat Pump and electrical Boiler with Independent Water Heating': 0,
+    'Central Hydronic Air and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV': 100,
+    'Central Hydronic Air and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV': 0,
+    'Central Hydronic Ground and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV': 0,
+    'Central Hydronic Ground and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW '
+    'and PV': 0,
+    'Central Hydronic Water and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV': 0,
+    'Central Hydronic Water and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW '
+    'and PV': 0,
+    'Central Hydronic Air and Gas Source Heating System with Unitary Split and Air Source HP DHW': 0,
+    'Central Hydronic Air and Electricity Source Heating System with Unitary Split and Air Source HP DHW': 0,
+    'Central Hydronic Ground and Gas Source Heating System with Unitary Split and Air Source HP DHW': 0,
+    'Central Hydronic Ground and Electricity Source Heating System with Unitary Split and Air Source HP DHW': 0,
+    'Central Hydronic Water and Gas Source Heating System with Unitary Split and Air Source HP DHW': 0,
+    'Central Hydronic Water and Electricity Source Heating System with Unitary Split and Air Source HP DHW': 0,
     'Rooftop PV System': 0
 }
 
diff --git a/hub/data/energy_systems/montreal_future_systems.xml b/hub/data/energy_systems/montreal_future_systems.xml
index 6c011daf..fc672497 100644
--- a/hub/data/energy_systems/montreal_future_systems.xml
+++ b/hub/data/energy_systems/montreal_future_systems.xml
@@ -684,14 +684,14 @@
         </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>18</system_id>
-            <name>template Air-to-Water heat pump with storage</name>
+            <name>template reversible 4-pipe air-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
             <nominal_heat_output/>
             <minimum_heat_output/>
             <maximum_heat_output/>
-            <heat_efficiency>2</heat_efficiency>
+            <heat_efficiency>2.5</heat_efficiency>
             <reversible>True</reversible>
             <fuel_type>electricity</fuel_type>
             <source_medium>Air</source_medium>
@@ -737,7 +737,7 @@
         </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>19</system_id>
-            <name>template Groundwater-to-Water heat pump with storage</name>
+            <name>template reversible 4-pipe groundwater-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
@@ -778,7 +778,7 @@
         </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>20</system_id>
-            <name>template Water-to-Water heat pump with storage</name>
+            <name>template reversible 4-pipe water-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
@@ -897,7 +897,7 @@
         </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>23</system_id>
-            <name>template Air-to-Water heat pump</name>
+            <name>template reversible 4-pipe air-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
@@ -948,7 +948,7 @@
         </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>24</system_id>
-            <name>template Groundwater-to-Water heat pump</name>
+            <name>template reversible 4-pipe groundwater-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
@@ -987,7 +987,7 @@
         </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>25</system_id>
-            <name>template Water-to-Water heat pump</name>
+            <name>template reversible 4-pipe water-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
@@ -1024,29 +1024,440 @@
             <cooling_supply_temperature/>
             <simultaneous_heat_cold>True</simultaneous_heat_cold>
         </non_pv_generation_component>
-        <pv_generation_component>
+        <non_pv_generation_component>
             <system_id>26</system_id>
-            <name>template Photovoltaic Module</name>
-            <system_type>photovoltaic</system_type>
+            <name>template reversible 2-pipe air-to-water heat pump with storage</name>
+			<system_type>heat pump</system_type>
             <model_name/>
             <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>3</heat_efficiency>
+            <reversible>True</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Air</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>4.5</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
             <nominal_electricity_output/>
-            <electricity_efficiency>0.2</electricity_efficiency>
-            <nominal_ambient_temperature/>
-            <nominal_cell_temperature/>
-            <nominal_radiation/>
-            <standard_test_condition_cell_temperature/>
-            <standard_test_condition_radiation/>
-            <standard_test_condition_maximum_power/>
-            <cell_temperature_coefficient/>
-            <width>2.0</width>
-            <height>1.0</height>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve>
+			    <curve_type>bi-quadratic</curve_type>
+			    <dependant_variable>COP</dependant_variable>
+		        <parameters>source_temperature</parameters>
+		        <parameters>supply_temperature</parameters>
+		        <coefficients  a="1.039924" b="0.014600" c="0.000006" d="-0.05026" e="0.000635" f="-0.000154"/>
+            </heat_efficiency_curve>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve>
+			    <curve_type>bi-quadratic</curve_type>
+			    <dependant_variable>COP</dependant_variable>
+		        <parameters>source_temperature</parameters>
+		        <parameters>supply_temperature</parameters>
+		        <coefficients  a="0.951894" b="-0.010518" c="0.000126" d="-0.003399" e="0.000183" f="-0.000206"/>
+            </cooling_efficiency_curve>
             <distribution_systems/>
-            <energy_storage_systems/>
+            <energy_storage_systems>
+                <storage_id>6</storage_id>
+            </energy_storage_systems>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
-        </pv_generation_component>
+        </non_pv_generation_component>
         <non_pv_generation_component>
             <system_id>27</system_id>
+            <name>template reversible 2-pipe groundwater-to-water heat pump with storage</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>3.5</heat_efficiency>
+            <reversible>True</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Ground</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>5</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems>
+                <storage_id>6</storage_id>
+            </energy_storage_systems>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>28</system_id>
+            <name>template reversible 2-pipe water-to-water heat pump with storage</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>4</heat_efficiency>
+            <reversible>True</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Water</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>6</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems>
+                <storage_id>6</storage_id>
+            </energy_storage_systems>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>29</system_id>
+            <name>template reversible 2-pipe air-to-water heat pump</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>3</heat_efficiency>
+            <reversible>True</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Air</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>4.5</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve>
+			    <curve_type>bi-quadratic</curve_type>
+			    <dependant_variable>COP</dependant_variable>
+		        <parameters>source_temperature</parameters>
+		        <parameters>supply_temperature</parameters>
+		        <coefficients  a="1.039924" b="0.014600" c="0.000006" d="-0.05026" e="0.000635" f="-0.000154"/>
+            </heat_efficiency_curve>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve>
+			    <curve_type>bi-quadratic</curve_type>
+			    <dependant_variable>COP</dependant_variable>
+		        <parameters>source_temperature</parameters>
+		        <parameters>supply_temperature</parameters>
+		        <coefficients  a="0.951894" b="-0.010518" c="0.000126" d="-0.003399" e="0.000183" f="-0.000206"/>
+            </cooling_efficiency_curve>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>30</system_id>
+            <name>template reversible 2-pipe groundwater-to-water heat pump</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>3.5</heat_efficiency>
+            <reversible>True</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Ground</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>5</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>31</system_id>
+            <name>template reversible 2-pipe water-to-water heat pump</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>4</heat_efficiency>
+            <reversible>True</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Water</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>6</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>32</system_id>
+            <name>template air-to-water heating heat pump</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>3</heat_efficiency>
+            <reversible>False</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Air</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency/>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve>
+			    <curve_type>bi-quadratic</curve_type>
+			    <dependant_variable>COP</dependant_variable>
+		        <parameters>source_temperature</parameters>
+		        <parameters>supply_temperature</parameters>
+		        <coefficients  a="1.039924" b="0.014600" c="0.000006" d="-0.05026" e="0.000635" f="-0.000154"/>
+            </heat_efficiency_curve>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>33</system_id>
+            <name>template groundwater-to-water heating heat pump</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>3.5</heat_efficiency>
+            <reversible>False</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Ground</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>5</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>34</system_id>
+            <name>template water-to-water heating heat pump</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>4</heat_efficiency>
+            <reversible>False</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Water</source_medium>
+            <supply_medium>Water</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>6</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>35</system_id>
+            <name>template unitary split system</name>
+			<system_type>heat pump</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency/>
+            <reversible>False</reversible>
+            <fuel_type>electricity</fuel_type>
+            <source_medium>Air</source_medium>
+            <supply_medium>Air</supply_medium>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>3</cooling_efficiency>
+            <electricity_efficiency/>
+            <source_temperature/>
+            <source_mass_flow/>
+            <nominal_electricity_output/>
+            <maximum_heat_supply_temperature/>
+            <minimum_heat_supply_temperature/>
+            <maximum_cooling_supply_temperature/>
+            <minimum_cooling_supply_temperature/>
+            <heat_output_curve/>
+            <heat_fuel_consumption_curve/>
+            <heat_efficiency_curve/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve>
+			    <curve_type>bi-quadratic</curve_type>
+			    <dependant_variable>COP</dependant_variable>
+		        <parameters>source_temperature</parameters>
+		        <parameters>supply_temperature</parameters>
+		        <coefficients  a="0.951894" b="-0.010518" c="0.000126" d="-0.003399" e="0.000183" f="-0.000206"/>
+            </cooling_efficiency_curve>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water>False</domestic_hot_water>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <system_id>36</system_id>
             <name>template domestic hot water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1092,6 +1503,27 @@
             <cooling_supply_temperature/>
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
+        <pv_generation_component>
+            <system_id>37</system_id>
+            <name>template Photovoltaic Module</name>
+            <system_type>photovoltaic</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_electricity_output/>
+            <electricity_efficiency>0.2</electricity_efficiency>
+            <nominal_ambient_temperature/>
+            <nominal_cell_temperature/>
+            <nominal_radiation/>
+            <standard_test_condition_cell_temperature/>
+            <standard_test_condition_radiation/>
+            <standard_test_condition_maximum_power/>
+            <cell_temperature_coefficient/>
+            <width>2.0</width>
+            <height>1.0</height>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </pv_generation_component>
     </energy_generation_components>
     <energy_storage_components>
         <thermalStorages>
@@ -1318,7 +1750,7 @@
 			<demand>electricity</demand>
 		</demands>
 		<components>
-			<generation_id>26</generation_id>
+			<generation_id>37</generation_id>
 		</components>
 	</system>
     <system>
@@ -1401,6 +1833,115 @@
 	</system>
     <system>
 		<id>8</id>
+		<name>4 pipe central air to water heat pump with storage tank</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+			<demand>cooling</demand>
+		</demands>
+		<components>
+			<generation_id>18</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>9</id>
+		<name>4 pipe central ground to water heat pump with storage tank</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+			<demand>cooling</demand>
+		</demands>
+		<components>
+			<generation_id>19</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>10</id>
+		<name>4 pipe central water to water heat pump with storage tank</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+			<demand>cooling</demand>
+		</demands>
+		<components>
+			<generation_id>20</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>11</id>
+		<name>hydronic heating system with air source heat pump storage tank and auxiliary gas boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+		</demands>
+		<components>
+			<generation_id>32</generation_id>
+			<generation_id>16</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>12</id>
+		<name>hydronic heating system with air source heat pump storage tank and auxiliary electric boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+		</demands>
+		<components>
+			<generation_id>32</generation_id>
+			<generation_id>17</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>13</id>
+		<name>hydronic heating system with ground source heat pump storage tank and auxiliary gas boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+		</demands>
+		<components>
+			<generation_id>33</generation_id>
+			<generation_id>16</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>14</id>
+		<name>hydronic heating system with ground source heat pump storage tank and auxiliary electric boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+		</demands>
+		<components>
+			<generation_id>33</generation_id>
+			<generation_id>17</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>15</id>
+		<name>hydronic heating system with water source heat pump storage tank and auxiliary gas boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+		</demands>
+		<components>
+			<generation_id>34</generation_id>
+			<generation_id>16</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>16</id>
+		<name>hydronic heating system with water source heat pump storage tank and auxiliary gas boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+			<demand>cooling</demand>
+		</demands>
+		<components>
+			<generation_id>35</generation_id>
+			<generation_id>17</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>17</id>
 		<name>district heating network with air to water heat pump gas boiler thermal storage tank</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
@@ -1412,7 +1953,7 @@
 		</components>
 	</system>
     <system>
-		<id>9</id>
+		<id>18</id>
 		<name>district heating network with air to water heat pump electrical boiler thermal storage tank</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
@@ -1424,7 +1965,7 @@
 		</components>
 	</system>
     <system>
-		<id>10</id>
+		<id>19</id>
 		<name>district heating network with ground to water heat pump gas boiler thermal storage tank</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
@@ -1436,7 +1977,7 @@
 		</components>
 	</system>
     <system>
-		<id>11</id>
+		<id>20</id>
 		<name>district heating network with ground to water heat pump electrical boiler thermal storage tank</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
@@ -1448,7 +1989,7 @@
 		</components>
 	</system>
     <system>
-		<id>12</id>
+		<id>21</id>
 		<name>district heating network with water to water heat pump gas boiler thermal storage tank</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
@@ -1460,7 +2001,7 @@
 		</components>
 	</system>
     <system>
-		<id>13</id>
+		<id>22</id>
 		<name>district heating network with water to water heat pump electrical boiler thermal storage tank</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
@@ -1472,140 +2013,130 @@
 		</components>
 	</system>
     <system>
-		<id>14</id>
-		<name>Unitary air to water heat pump cooling system</name>
+		<id>23</id>
+		<name>Unitary split cooling system</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
 			<demand>cooling</demand>
 		</demands>
 		<components>
-			<generation_id>23</generation_id>
+			<generation_id>35</generation_id>
 		</components>
 	</system>
     <system>
-		<id>15</id>
-		<name>Unitary ground to water heat pump cooling system</name>
-		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
-		<demands>
-			<demand>cooling</demand>
-		</demands>
-		<components>
-			<generation_id>24</generation_id>
-		</components>
-	</system>
-    <system>
-		<id>16</id>
-		<name>unitary water to water heat pump cooling system</name>
-		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
-		<demands>
-			<demand>cooling</demand>
-		</demands>
-		<components>
-			<generation_id>25</generation_id>
-		</components>
-	</system>
-    <system>
-		<id>17</id>
+		<id>24</id>
 		<name>Domestic Hot Water Heat Pump with Coiled Storage</name>
 		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
 		<demands>
 			<demand>domestic_hot_water</demand>
 		</demands>
 		<components>
-			<generation_id>27</generation_id>
+			<generation_id>36</generation_id>
 		</components>
 	</system>
   </systems>
 
   <system_archetypes>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Air to Water Heat Pump and Gas Boiler with Independent Water Heating and PV</name>
+		<name>Central Hydronic Air and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
 		<systems>
 			<system_id>1</system_id>
-			<system_id>2</system_id>
-            <system_id>17</system_id>
+			<system_id>11</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Air to Water Heat Pump and electrical Boiler with Independent Water Heating and PV</name>
+		<name>Central Hydronic Air and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
 		<systems>
 			<system_id>1</system_id>
-			<system_id>3</system_id>
+			<system_id>12</system_id>
+            <system_id>23</system_id>
             <system_id>8</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Ground to Water Heat Pump and Gas Boiler with Independent Water Heating and PV</name>
+		<name>Central Hydronic Ground and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
 		<systems>
 			<system_id>1</system_id>
-			<system_id>4</system_id>
-            <system_id>17</system_id>
+			<system_id>13</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Ground to Water Heat Pump and electrical Boiler with Independent Water Heating and PV</name>
+		<name>Central Hydronic Ground and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
 		<systems>
 			<system_id>1</system_id>
-			<system_id>5</system_id>
-            <system_id>17</system_id>
+			<system_id>14</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Water to Water Heat Pump and Gas Boiler with Independent Water Heating and PV</name>
+		<name>Central Hydronic Water and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
 		<systems>
 			<system_id>1</system_id>
-			<system_id>6</system_id>
-            <system_id>17</system_id>
+			<system_id>15</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Water to Water Heat Pump and electrical Boiler with Independent Water Heating and PV</name>
+		<name>Central Hydronic Water and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
 		<systems>
 			<system_id>1</system_id>
-			<system_id>7</system_id>
-            <system_id>17</system_id>
+			<system_id>16</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Air to Water Heat Pump and Gas Boiler with Independent Water Heating</name>
+		<name>Central Hydronic Air and Gas Source Heating System with Unitary Split and Air Source HP DHW</name>
 		<systems>
-			<system_id>2</system_id>
-            <system_id>17</system_id>
+			<system_id>11</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Air to Water Heat Pump and electrical Boiler with Independent Water Heating</name>
+		<name>Central Hydronic Air and Electricity Source Heating System with Unitary Split and Air Source HP DHW</name>
 		<systems>
-			<system_id>3</system_id>
-            <system_id>17</system_id>
+			<system_id>12</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Ground to Water Heat Pump and Gas Boiler with Independent Water Heating</name>
+		<name>Central Hydronic Ground and Gas Source Heating System with Unitary Split and Air Source HP DHW</name>
 		<systems>
-			<system_id>4</system_id>
-            <system_id>17</system_id>
+			<system_id>13</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Ground to Water Heat Pump and electrical Boiler with Independent Water Heating</name>
+		<name>Central Hydronic Ground and Electricity Source Heating System with Unitary Split and Air Source HP DHW</name>
 		<systems>
-			<system_id>5</system_id>
-            <system_id>17</system_id>
+			<system_id>14</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Water to Water Heat Pump and Gas Boiler with Independent Water Heating</name>
+		<name>Central Hydronic Water and Gas Source Heating System with Unitary Split and Air Source HP DHW</name>
 		<systems>
-			<system_id>6</system_id>
-            <system_id>17</system_id>
+			<system_id>15</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central 4 Pipes Water to Water Heat Pump and electrical Boiler with Independent Water Heating</name>
+		<name>Central Hydronic Water and Electricity Source Heating System with Unitary Split and Air Source HP DHW</name>
 		<systems>
-			<system_id>7</system_id>
-            <system_id>17</system_id>
+			<system_id>16</system_id>
+            <system_id>23</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="2">
diff --git a/tests/test_systems_catalog.py b/tests/test_systems_catalog.py
index 68401719..fe4d54d3 100644
--- a/tests/test_systems_catalog.py
+++ b/tests/test_systems_catalog.py
@@ -41,9 +41,9 @@ class TestSystemsCatalog(TestCase):
     archetypes = catalog.names()
     self.assertEqual(13, len(archetypes['archetypes']))
     systems = catalog.names('systems')
-    self.assertEqual(17, len(systems['systems']))
+    self.assertEqual(24, len(systems['systems']))
     generation_equipments = catalog.names('generation_equipments')
-    self.assertEqual(27, len(generation_equipments['generation_equipments']))
+    self.assertEqual(37, len(generation_equipments['generation_equipments']))
     with self.assertRaises(ValueError):
       catalog.names('unknown')