diff --git a/hub/catalog_factories/energy_systems/montreal_future_system_catalogue.py b/hub/catalog_factories/energy_systems/montreal_future_system_catalogue.py
index 4a9672ad..6c5678f0 100644
--- a/hub/catalog_factories/energy_systems/montreal_future_system_catalogue.py
+++ b/hub/catalog_factories/energy_systems/montreal_future_system_catalogue.py
@@ -30,7 +30,8 @@ class MontrealFutureSystemCatalogue(Catalog):
     path = str(path / 'montreal_future_systems.xml')
     with open(path, 'r', encoding='utf-8') as xml:
       self._archetypes = xmltodict.parse(xml.read(),
-                                         force_list=['pv_generation_component', 'templateStorages', 'demand'])
+                                         force_list=['pv_generation_component', 'templateStorages', 'demand',
+                                                     'system', 'system_id'])
 
     self._storage_components = self._load_storage_components()
     self._generation_components = self._load_generation_components()
@@ -49,7 +50,7 @@ class MontrealFutureSystemCatalogue(Catalog):
       'non_pv_generation_component']
     if non_pv_generation_components is not None:
       for non_pv in non_pv_generation_components:
-        system_id = non_pv['system_id']
+        system_id = non_pv['generation_system_id']
         name = non_pv['name']
         system_type = non_pv['system_type']
         model_name = non_pv['model_name']
@@ -181,7 +182,7 @@ class MontrealFutureSystemCatalogue(Catalog):
       'pv_generation_component']
     if pv_generation_components is not None:
       for pv in pv_generation_components:
-        system_id = pv['system_id']
+        system_id = pv['generation_system_id']
         name = pv['name']
         system_type = pv['system_type']
         model_name = pv['model_name']
diff --git a/hub/data/energy_systems/montreal_future_systems.xml b/hub/data/energy_systems/montreal_future_systems.xml
index e85ad3fb..12f5130e 100644
--- a/hub/data/energy_systems/montreal_future_systems.xml
+++ b/hub/data/energy_systems/montreal_future_systems.xml
@@ -17,7 +17,7 @@
     </media>
     <energy_generation_components>
         <non_pv_generation_component>
-            <system_id>1</system_id>
+            <generation_system_id>1</generation_system_id>
             <name>Natural-Gas Boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ALP080B</model_name>
@@ -56,7 +56,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>2</system_id>
+            <generation_system_id>2</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ALP105B</model_name>
@@ -95,7 +95,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>3</system_id>
+            <generation_system_id>3</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ALP150B</model_name>
@@ -134,7 +134,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>4</system_id>
+            <generation_system_id>4</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ALP210B</model_name>
@@ -173,7 +173,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>5</system_id>
+            <generation_system_id>5</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ALTAC-136</model_name>
@@ -212,7 +212,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>6</system_id>
+            <generation_system_id>6</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ALTA-120</model_name>
@@ -251,7 +251,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>7</system_id>
+            <generation_system_id>7</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ASPN-085</model_name>
@@ -290,7 +290,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>8</system_id>
+            <generation_system_id>8</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ASPN-110</model_name>
@@ -329,7 +329,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>9</system_id>
+            <generation_system_id>9</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>ASPNC-155</model_name>
@@ -368,7 +368,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>10</system_id>
+            <generation_system_id>10</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>K2WTC-135B</model_name>
@@ -407,7 +407,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>11</system_id>
+            <generation_system_id>11</generation_system_id>
             <name>Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name>K2WTC-180B</model_name>
@@ -446,27 +446,27 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <pv_generation_component>
-            <system_id>12</system_id>
+            <generation_system_id>12</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>445MS</model_name>
             <manufacturer>Canadian Solar</manufacturer>
-            <nominal_electricity_output/>
-            <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/>
+            <nominal_electricity_output>332</nominal_electricity_output>
+            <electricity_efficiency>0.201</electricity_efficiency>
+            <nominal_ambient_temperature>20</nominal_ambient_temperature>
+            <nominal_cell_temperature>40</nominal_cell_temperature>
+            <nominal_radiation>800</nominal_radiation>
+            <standard_test_condition_cell_temperature>25</standard_test_condition_cell_temperature>
+            <standard_test_condition_radiation>1000</standard_test_condition_radiation>
+            <standard_test_condition_maximum_power>445</standard_test_condition_maximum_power>
+            <cell_temperature_coefficient>0.35</cell_temperature_coefficient>
             <width>2.01</width>
             <height>1.048</height>
             <distribution_systems/>
             <energy_storage_systems/>
         </pv_generation_component>
         <non_pv_generation_component>
-            <system_id>13</system_id>
+            <generation_system_id>13</generation_system_id>
             <name>Air-to-Water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name>CMAA 012</model_name>
@@ -511,7 +511,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>14</system_id>
+            <generation_system_id>14</generation_system_id>
             <name>Air-to-Water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name>CMAA 70</model_name>
@@ -556,7 +556,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>15</system_id>
+            <generation_system_id>15</generation_system_id>
             <name>Air-to-Water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name>CMAA 140</model_name>
@@ -601,7 +601,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>16</system_id>
+            <generation_system_id>16</generation_system_id>
             <name>template Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name/>
@@ -642,7 +642,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>17</system_id>
+            <generation_system_id>17</generation_system_id>
             <name>template Electric boiler</name>
 			<system_type>boiler</system_type>
             <model_name/>
@@ -683,7 +683,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>18</system_id>
+            <generation_system_id>18</generation_system_id>
             <name>template reversible 4-pipe air-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -736,7 +736,7 @@
             <simultaneous_heat_cold>True</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>19</system_id>
+            <generation_system_id>19</generation_system_id>
             <name>template reversible 4-pipe groundwater-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -777,7 +777,7 @@
             <simultaneous_heat_cold>True</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>20</system_id>
+            <generation_system_id>20</generation_system_id>
             <name>template reversible 4-pipe water-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -818,7 +818,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>21</system_id>
+            <generation_system_id>21</generation_system_id>
             <name>template Natural-Gas boiler</name>
 			<system_type>boiler</system_type>
             <model_name/>
@@ -857,7 +857,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>22</system_id>
+            <generation_system_id>22</generation_system_id>
             <name>template Electric boiler</name>
 			<system_type>boiler</system_type>
             <model_name/>
@@ -896,7 +896,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>23</system_id>
+            <generation_system_id>23</generation_system_id>
             <name>template reversible 4-pipe air-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -947,7 +947,7 @@
             <simultaneous_heat_cold>True</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>24</system_id>
+            <generation_system_id>24</generation_system_id>
             <name>template reversible 4-pipe groundwater-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -986,7 +986,7 @@
             <simultaneous_heat_cold>True</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>25</system_id>
+            <generation_system_id>25</generation_system_id>
             <name>template reversible 4-pipe water-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1025,7 +1025,7 @@
             <simultaneous_heat_cold>True</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>26</system_id>
+            <generation_system_id>26</generation_system_id>
             <name>template reversible 2-pipe air-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1078,7 +1078,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>27</system_id>
+            <generation_system_id>27</generation_system_id>
             <name>template reversible 2-pipe groundwater-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1119,7 +1119,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>28</system_id>
+            <generation_system_id>28</generation_system_id>
             <name>template reversible 2-pipe water-to-water heat pump with storage</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1160,7 +1160,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>29</system_id>
+            <generation_system_id>29</generation_system_id>
             <name>template reversible 2-pipe air-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1211,7 +1211,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>30</system_id>
+            <generation_system_id>30</generation_system_id>
             <name>template reversible 2-pipe groundwater-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1250,7 +1250,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>31</system_id>
+            <generation_system_id>31</generation_system_id>
             <name>template reversible 2-pipe water-to-water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1289,7 +1289,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>32</system_id>
+            <generation_system_id>32</generation_system_id>
             <name>template air-to-water heating heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1334,7 +1334,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>33</system_id>
+            <generation_system_id>33</generation_system_id>
             <name>template groundwater-to-water heating heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1373,7 +1373,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>34</system_id>
+            <generation_system_id>34</generation_system_id>
             <name>template water-to-water heating heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1412,7 +1412,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>35</system_id>
+            <generation_system_id>35</generation_system_id>
             <name>template unitary split system</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1457,7 +1457,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
         <non_pv_generation_component>
-            <system_id>36</system_id>
+            <generation_system_id>36</generation_system_id>
             <name>template domestic hot water heat pump</name>
 			<system_type>heat pump</system_type>
             <model_name/>
@@ -1503,8 +1503,125 @@
             <cooling_supply_temperature/>
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </non_pv_generation_component>
+        <non_pv_generation_component>
+            <generation_system_id>37</generation_system_id>
+            <name>template gas furnace</name>
+			<system_type>furnace</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>0.85</heat_efficiency>
+            <reversible/>
+            <fuel_type>natural gas</fuel_type>
+            <source_medium/>
+            <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/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water/>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <generation_system_id>38</generation_system_id>
+            <name>template electrical furnace</name>
+			<system_type>furnace</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency>0.85</heat_efficiency>
+            <reversible/>
+            <fuel_type>electricity</fuel_type>
+            <source_medium/>
+            <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/>
+            <cooling_output_curve/>
+            <cooling_fuel_consumption_curve/>
+            <cooling_efficiency_curve/>
+            <distribution_systems/>
+            <energy_storage_systems/>
+            <domestic_hot_water/>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
+        <non_pv_generation_component>
+            <generation_system_id>39</generation_system_id>
+            <name>template air cooled DX with external condenser</name>
+			<system_type>cooler</system_type>
+            <model_name/>
+            <manufacturer/>
+            <nominal_heat_output/>
+            <minimum_heat_output/>
+            <maximum_heat_output/>
+            <heat_efficiency/>
+            <reversible/>
+            <fuel_type>electricity</fuel_type>
+            <source_medium/>
+            <supply_medium/>
+            <nominal_cooling_output/>
+            <minimum_cooling_output/>
+            <maximum_cooling_output/>
+            <cooling_efficiency>3.23</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/>
+            <heat_supply_temperature/>
+            <cooling_supply_temperature/>
+            <simultaneous_heat_cold>False</simultaneous_heat_cold>
+        </non_pv_generation_component>
         <pv_generation_component>
-            <system_id>37</system_id>
+            <generation_system_id>40</generation_system_id>
             <name>template Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name/>
@@ -1525,7 +1642,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>38</system_id>
+            <generation_system_id>41</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>RE400CAA Pure 2</model_name>
@@ -1546,7 +1663,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>39</system_id>
+            <generation_system_id>42</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>RE410CAA Pure 2</model_name>
@@ -1567,7 +1684,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>40</system_id>
+            <generation_system_id>43</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>RE420CAA Pure 2</model_name>
@@ -1588,7 +1705,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>41</system_id>
+            <generation_system_id>44</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>RE430CAA Pure 2</model_name>
@@ -1609,7 +1726,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>42</system_id>
+            <generation_system_id>45</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>REC600AA Pro M</model_name>
@@ -1630,7 +1747,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>43</system_id>
+            <generation_system_id>46</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>REC610AA Pro M</model_name>
@@ -1651,7 +1768,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>44</system_id>
+            <generation_system_id>47</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>REC620AA Pro M</model_name>
@@ -1672,7 +1789,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>45</system_id>
+            <generation_system_id>48</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>REC630AA Pro M</model_name>
@@ -1693,7 +1810,7 @@
             <simultaneous_heat_cold>False</simultaneous_heat_cold>
         </pv_generation_component>
         <pv_generation_component>
-            <system_id>46</system_id>
+            <generation_system_id>49</generation_system_id>
             <name>Photovoltaic Module</name>
             <system_type>photovoltaic</system_type>
             <model_name>REC640AA Pro M</model_name>
@@ -1939,7 +2056,7 @@
 			<demand>electricity</demand>
 		</demands>
 		<components>
-			<generation_id>37</generation_id>
+			<generation_id>40</generation_id>
 		</components>
 	</system>
     <system>
@@ -2223,11 +2340,186 @@
 			<generation_id>36</generation_id>
 		</components>
 	</system>
+    <system>
+        <id>25</id>
+        <name>Unitary air conditioner with baseboard heater fuel fired boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>21</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>26</id>
+        <name>Unitary air conditioner with baseboard heater electrical boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>22</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>27</id>
+        <name>4 pipe fan coils with fuel fired boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>21</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>28</id>
+        <name>4 pipe fan coils with electrical resistance water boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>21</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>29</id>
+        <name>Single zone packaged rooftop unit with fuel-fired furnace and baseboards and fuel boiler for acs</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>37</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>30</id>
+        <name>Single zone packaged rooftop unit with electrical resistance furnace and baseboards and fuel boiler for acs</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>38</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>31</id>
+        <name>Single zone make-up air unit with baseboard heating with fuel fired boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>21</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>32</id>
+        <name>Single zone make-up air unit with electrical baseboard heating and DHW with resistance</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>22</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>33</id>
+        <name>Multi-zone built-up system with baseboard heater hydronic with fuel fired boiler</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>21</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>34</id>
+        <name>Multi-zone built-up system with electrical baseboard heater and electrical hot water</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>heating</demand>
+            <demand>domestic_hot_water</demand>
+        </demands>
+        <components>
+            <generation_id>22</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>35</id>
+        <name>Unitary air conditioner air cooled DX with external condenser</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>cooling</demand>
+        </demands>
+        <components>
+            <generation_id>39</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>36</id>
+        <name>4 pipe fan coils with water cooled, water chiller</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>cooling</demand>
+        </demands>
+        <components>
+            <generation_id>39</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>37</id>
+        <name>Single zone packaged rooftop unit with air cooled DX</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>cooling</demand>
+        </demands>
+        <components>
+            <generation_id>39</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>38</id>
+        <name>Single zone make-up air unit with air cooled DX</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>cooling</demand>
+        </demands>
+        <components>
+            <generation_id>39</generation_id>
+        </components>
+    </system>
+    <system>
+        <id>39</id>
+        <name>Multi-zone built-up system with water cooled, water chiller</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+        <demands>
+            <demand>cooling</demand>
+        </demands>
+        <components>
+            <generation_id>39</generation_id>
+        </components>
+    </system>
   </systems>
 
   <system_archetypes>
 	<system_archetype cluster_id="1">
-		<name>Central Hydronic Air and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
+		<name>Central Hydronic Air and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and Grid Tied PV</name>
 		<systems>
 			<system_id>1</system_id>
 			<system_id>11</system_id>
@@ -2236,16 +2528,16 @@
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central Hydronic Air and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
+		<name>Central Hydronic Air and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and Grid Tied PV</name>
 		<systems>
 			<system_id>1</system_id>
 			<system_id>12</system_id>
             <system_id>23</system_id>
-            <system_id>8</system_id>
+            <system_id>24</system_id>
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central Hydronic Ground and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
+		<name>Central Hydronic Ground and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and Grid Tied PV</name>
 		<systems>
 			<system_id>1</system_id>
 			<system_id>13</system_id>
@@ -2254,7 +2546,7 @@
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central Hydronic Ground and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
+		<name>Central Hydronic Ground and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and Grid Tied PV</name>
 		<systems>
 			<system_id>1</system_id>
 			<system_id>14</system_id>
@@ -2263,7 +2555,7 @@
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central Hydronic Water and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
+		<name>Central Hydronic Water and Gas Source Heating System with Unitary Split Cooling and Air Source HP DHW and Grid Tied PV</name>
 		<systems>
 			<system_id>1</system_id>
 			<system_id>15</system_id>
@@ -2272,7 +2564,7 @@
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="1">
-		<name>Central Hydronic Water and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and PV</name>
+		<name>Central Hydronic Water and Electricity Source Heating System with Unitary Split Cooling and Air Source HP DHW and Grid Tied PV</name>
 		<systems>
 			<system_id>1</system_id>
 			<system_id>16</system_id>
@@ -2329,11 +2621,165 @@
 		</systems>
 	</system_archetype>
 	<system_archetype cluster_id="2">
-		<name>Grid-Tied PV System</name>
+		<name>Grid Tied PV System</name>
 		<systems>
 			<system_id>1</system_id>
 		</systems>
 	</system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 1 gas</name>
+        <systems>
+            <system_id>25</system_id>
+            <system_id>35</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 1 gas grid tied pv</name>
+        <systems>
+            <system_id>1</system_id>
+            <system_id>25</system_id>
+            <system_id>35</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 1 electricity</name>
+        <systems>
+            <system_id>26</system_id>
+            <system_id>35</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 1 electricity grid tied pv</name>
+        <systems>
+            <system_id>26</system_id>
+            <system_id>1</system_id>
+            <system_id>35</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 2 gas</name>
+        <systems>
+            <system_id>27</system_id>
+            <system_id>36</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 2 gas grid tied pv</name>
+        <systems>
+            <system_id>1</system_id>
+            <system_id>27</system_id>
+            <system_id>36</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 2 electricity</name>
+        <systems>
+            <system_id>28</system_id>
+            <system_id>36</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 2 electricity grid tied pv</name>
+        <systems>
+            <system_id>1</system_id>
+            <system_id>28</system_id>
+            <system_id>36</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 3 and 4 gas</name>
+        <systems>
+            <system_id>29</system_id>
+            <system_id>37</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 3 and 4 gas grid tied pv</name>
+        <systems>
+            <system_id>1</system_id>
+            <system_id>29</system_id>
+            <system_id>37</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 3 and 4 electricity</name>
+        <systems>
+            <system_id>30</system_id>
+            <system_id>37</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 3 and 4 electricity grid tied pv</name>
+        <systems>
+            <system_id>30</system_id>
+            <system_id>37</system_id>
+            <system_id>1</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 6 gas</name>
+        <systems>
+            <system_id>33</system_id>
+            <system_id>39</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 6 gas grid tied pv</name>
+        <systems>
+            <system_id>33</system_id>
+            <system_id>39</system_id>
+            <system_id>1</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 6 electricity</name>
+        <systems>
+            <system_id>34</system_id>
+            <system_id>39</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 6 electricity grid tied pv</name>
+        <systems>
+            <system_id>34</system_id>
+            <system_id>39</system_id>
+            <system_id>1</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 7 electricity grid tied pv</name>
+        <systems>
+            <system_id>1</system_id>
+            <system_id>8</system_id>
+            <system_id>24</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 8 gas</name>
+        <systems>
+            <system_id>25</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 8 gas grid tied pv</name>
+        <systems>
+            <system_id>25</system_id>
+            <system_id>1</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 8 electricity</name>
+        <systems>
+            <system_id>26</system_id>
+        </systems>
+    </system_archetype>
+    <system_archetype cluster_id="1">
+        <name>system 8 electricity grid tied pv</name>
+        <systems>
+            <system_id>26</system_id>
+            <system_id>1</system_id>
+        </systems>
+    </system_archetype>
   </system_archetypes>
 </EnergySystemCatalog>
 
diff --git a/hub/helpers/constants.py b/hub/helpers/constants.py
index f345b4f0..fda9a4e3 100644
--- a/hub/helpers/constants.py
+++ b/hub/helpers/constants.py
@@ -304,6 +304,7 @@ GRID = 'Grid'
 ONSITE_ELECTRICITY = 'Onsite Electricity'
 PHOTOVOLTAIC = 'Photovoltaic'
 BOILER = 'Boiler'
+FURNACE = 'Furnace'
 HEAT_PUMP = 'Heat Pump'
 BASEBOARD = 'Baseboard'
 ELECTRICITY_GENERATOR = 'Electricity generator'
diff --git a/hub/helpers/data/montreal_generation_system_to_hub_energy_generation_system.py b/hub/helpers/data/montreal_generation_system_to_hub_energy_generation_system.py
index 163f74df..7d4d4db1 100644
--- a/hub/helpers/data/montreal_generation_system_to_hub_energy_generation_system.py
+++ b/hub/helpers/data/montreal_generation_system_to_hub_energy_generation_system.py
@@ -15,7 +15,7 @@ class MontrealGenerationSystemToHubEnergyGenerationSystem:
   def __init__(self):
     self._dictionary = {
       'boiler': cte.BOILER,
-      'furnace': cte.BASEBOARD,
+      'furnace': cte.FURNACE,
       'cooler': cte.CHILLER,
       'electricity generator': cte.ELECTRICITY_GENERATOR,
       'photovoltaic': cte.PHOTOVOLTAIC,
diff --git a/tests/test_systems_catalog.py b/tests/test_systems_catalog.py
index b8011ea6..45e58453 100644
--- a/tests/test_systems_catalog.py
+++ b/tests/test_systems_catalog.py
@@ -39,11 +39,11 @@ class TestSystemsCatalog(TestCase):
 
     catalog_categories = catalog.names()
     archetypes = catalog.names()
-    self.assertEqual(13, len(archetypes['archetypes']))
+    self.assertEqual(34, len(archetypes['archetypes']))
     systems = catalog.names('systems')
-    self.assertEqual(24, len(systems['systems']))
+    self.assertEqual(39, len(systems['systems']))
     generation_equipments = catalog.names('generation_equipments')
-    self.assertEqual(46, len(generation_equipments['generation_equipments']))
+    self.assertEqual(49, len(generation_equipments['generation_equipments']))
     with self.assertRaises(ValueError):
       catalog.names('unknown')
 
@@ -55,6 +55,7 @@ class TestSystemsCatalog(TestCase):
     with self.assertRaises(IndexError):
       catalog.get_entry('unknown')
 
+
   def test_palma_catalog(self):
     catalog = EnergySystemsCatalogFactory('palma').catalog
     catalog_categories = catalog.names()
diff --git a/tests/test_systems_factory.py b/tests/test_systems_factory.py
index 26c2534d..e0ce412d 100644
--- a/tests/test_systems_factory.py
+++ b/tests/test_systems_factory.py
@@ -115,7 +115,7 @@ class TestSystemsFactory(TestCase):
 
     for building in self._city.buildings:
       building.energy_systems_archetype_name = ('Central Hydronic Air and Gas Source Heating System with Unitary Split '
-                                                'Cooling and Air Source HP DHW and PV')
+                                                'Cooling and Air Source HP DHW and Grid Tied PV')
     EnergySystemsFactory('montreal_future', self._city).enrich()
     # Need to assign energy systems to buildings:
     for building in self._city.buildings:
@@ -132,7 +132,8 @@ class TestSystemsFactory(TestCase):
       self.assertLess(0, building.heating_consumption[cte.YEAR][0])
       self.assertLess(0, building.cooling_consumption[cte.YEAR][0])
       self.assertLess(0, building.domestic_hot_water_consumption[cte.YEAR][0])
-      self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0])
+      if 'PV' in building.energy_systems_archetype_name:
+        self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0])
 
   def test_palma_system_results(self):
     """