diff --git a/hub/catalog_factories/data_models/energy_systems/generation_system.py b/hub/catalog_factories/data_models/energy_systems/generation_system.py
index d3b41939..2f5cfaa9 100644
--- a/hub/catalog_factories/data_models/energy_systems/generation_system.py
+++ b/hub/catalog_factories/data_models/energy_systems/generation_system.py
@@ -5,6 +5,8 @@ Copyright © 2023 Concordia CERC group
Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
"""
+from __future__ import annotations
+
class GenerationSystem:
def __init__(self, system_type, fuel_type, source_types, heat_efficiency, cooling_efficiency, electricity_efficiency,
diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index 87183ce5..f607dc6e 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -1,5 +1,125 @@
-
-
-
-
-
\ No newline at end of file
+
+
+
+ Fuel-fired water boiler with baseboards
+
+ heating
+ domestic_hot_water
+
+ 0.85
+ 10
+ 2
+ true
+
+
+ Electrical resistance water boiler
+
+ heating
+ domestic_hot_water
+
+ 1
+ 10
+ 2
+ true
+
+
+ Fuel-fired furnace
+
+ heating
+
+ 0.85
+ 25
+ 5
+ false
+
+
+ Electrical resistance furnace
+
+ heating
+
+ 1
+ 25
+ 5
+ false
+
+
+ Baseboards: hydronic with fuel boiler
+
+ heating
+
+ 0.85
+ 10
+ 5
+ false
+
+
+ Electrical baseboards
+
+ heating
+
+ 1
+ 0
+ 0
+ false
+
+
+ Air cooled DX with external condenser
+
+ cooling
+
+ 3.23
+ 0
+ 5
+ false
+
+
+ Water cooled, water chiller
+
+ cooling
+
+ 3.23
+ 10
+ 5
+ false
+
+
+ Air cooled DX
+
+ cooling
+
+ 3.23
+ 0
+ 5
+ false
+
+
+ PV system
+
+ electricity
+
+ 0.22
+ true
+
+
+
+
+
+ 1
+ 7
+
+
+
+
+ 2
+ 7
+
+
+
+
+ 2
+ 7
+ 10
+
+
+
+
\ No newline at end of file