diff --git a/hub/catalog_factories/energy_systems/__pycache__/montreal_custom_catalog.cpython-39.pyc b/hub/catalog_factories/energy_systems/__pycache__/montreal_custom_catalog.cpython-39.pyc
index 29d54354..17e1be94 100644
Binary files a/hub/catalog_factories/energy_systems/__pycache__/montreal_custom_catalog.cpython-39.pyc and b/hub/catalog_factories/energy_systems/__pycache__/montreal_custom_catalog.cpython-39.pyc differ
diff --git a/hub/imports/energy_systems/__pycache__/montreal_future_energy_systems_parameters.cpython-39.pyc b/hub/imports/energy_systems/__pycache__/montreal_future_energy_systems_parameters.cpython-39.pyc
index d3cc174c..0b02f19a 100644
Binary files a/hub/imports/energy_systems/__pycache__/montreal_future_energy_systems_parameters.cpython-39.pyc and b/hub/imports/energy_systems/__pycache__/montreal_future_energy_systems_parameters.cpython-39.pyc differ
diff --git a/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py b/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
index 8b585108..542608a0 100644
--- a/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
+++ b/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
@@ -90,11 +90,23 @@ class MontrealFutureEnergySystemParameters:
       for archetype_generation_system in archetype_system.generation_systems:
         if archetype_generation_system.system_type == 'Photovoltaic':
           _generation_system = PvGenerationSystem()
+          _generation_system.name = archetype_generation_system.name
+          _generation_system.model_name = archetype_generation_system.model_name
+          _generation_system.manufacturer = archetype_generation_system.manufacturer
           _type = 'PV system'
           _generation_system.system_type = Dictionaries().montreal_generation_system_to_hub_energy_generation_system[_type]
           _fuel_type = Dictionaries().montreal_custom_fuel_to_hub_fuel[archetype_generation_system.fuel_type]
           _generation_system.fuel_type = _fuel_type
           _generation_system.electricity_efficiency = archetype_generation_system.electricity_efficiency
+          _generation_system.nominal_electricity_output = archetype_generation_system.nominal_electricity_output
+          _generation_system.nominal_ambient_temperature = archetype_generation_system.nominal_ambient_temperature
+          _generation_system.nominal_cell_temperature = archetype_generation_system.nominal_cell_temperature
+          _generation_system.nominal_radiation = archetype_generation_system.nominal_radiation
+          _generation_system.standard_test_condition_cell_temperature = archetype_generation_system.standard_test_condition_cell_temperature
+          _generation_system.standard_test_condition_maximum_power = archetype_generation_system.standard_test_condition_maximum_power
+          _generation_system.cell_temperature_coefficient = archetype_generation_system.cell_temperature_coefficient
+          _generation_system.width = archetype_generation_system.width
+          _generation_system.height = archetype_generation_system.height
           _generic_storage_system = None
           if archetype_generation_system.energy_storage_systems is not None:
             _generic_storage_system = ElectricalStorageSystem()
@@ -102,11 +114,35 @@ class MontrealFutureEnergySystemParameters:
           _generation_system.energy_storage_systems = [_generic_storage_system]
         else:
           _generation_system = NonPvGenerationSystem()
+          _generation_system.name = archetype_generation_system.name
+          _generation_system.model_name = archetype_generation_system.model_name
+          _generation_system.manufacturer = archetype_generation_system.manufacturer
           _type = archetype_generation_system.system_type
           _generation_system.system_type = Dictionaries().montreal_generation_system_to_hub_energy_generation_system[_type]
           _fuel_type = Dictionaries().north_america_custom_fuel_to_hub_fuel[archetype_generation_system.fuel_type]
           _generation_system.fuel_type = _fuel_type
-          _generation_system.source_types = archetype_generation_system.source_medium
+          _generation_system.nominal_heat_output = archetype_generation_system.nominal_heat_output
+          _generation_system.nominal_cooling_output = archetype_generation_system.nominal_cooling_output
+          _generation_system.maximum_heat_output = archetype_generation_system.maximum_heat_output
+          _generation_system.minimum_heat_output = archetype_generation_system.minimum_heat_output
+          _generation_system.maximum_cooling_output = archetype_generation_system.maximum_cooling_output
+          _generation_system.minimum_cooling_output = archetype_generation_system.minimum_cooling_output
+          _generation_system.source_temperature = archetype_generation_system.source_temperature
+          _generation_system.source_mass_flow = archetype_generation_system.source_mass_flow
+          _generation_system.supply_medium = archetype_generation_system.supply_medium
+          _generation_system.maximum_heat_supply_temperature = archetype_generation_system.maximum_heat_supply_temperature
+          _generation_system.maximum_cooling_supply_temperature = archetype_generation_system.maximum_cooling_supply_temperature
+          _generation_system.minimum_heat_supply_temperature = archetype_generation_system.minimum_heat_supply_temperature
+          _generation_system.minimum_cooling_supply_temperature = archetype_generation_system.minimum_cooling_supply_temperature
+          _generation_system.heat_output_curve = archetype_generation_system.heat_output_curve
+          _generation_system.heat_fuel_consumption_curve = archetype_generation_system.heat_fuel_consumption_curve
+          _generation_system.heat_efficiency_curve = archetype_generation_system.heat_efficiency_curve
+          _generation_system.cooling_output_curve = archetype_generation_system.cooling_output_curve
+          _generation_system.cooling_fuel_consumption_curve = archetype_generation_system.cooling_fuel_consumption_curve
+          _generation_system.cooling_efficiency_curve = archetype_generation_system.cooling_efficiency_curve
+          _generation_system.dual_supply_capability = archetype_generation_system.dual_supply_capability
+          _generation_system.nominal_electricity_output = archetype_generation_system.nominal_electricity_output
+          _generation_system.source_medium = archetype_generation_system.source_medium
           _generation_system.heat_efficiency = archetype_generation_system.heat_efficiency
           _generation_system.cooling_efficiency = archetype_generation_system.cooling_efficiency
           _generation_system.electricity_efficiency = archetype_generation_system.electricity_efficiency
diff --git a/tests/__pycache__/test_systems_factory.cpython-39.pyc b/tests/__pycache__/test_systems_factory.cpython-39.pyc
index 455598d5..f6c71e1a 100644
Binary files a/tests/__pycache__/test_systems_factory.cpython-39.pyc and b/tests/__pycache__/test_systems_factory.cpython-39.pyc differ