diff --git a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
index 55fa4bf4..79a5d745 100644
--- a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
+++ b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
@@ -40,15 +40,10 @@ class NorthAmericaEnergySystemCatalog(Catalog):
   def _load_generation_components(self):
     generation_components = []
     boilers = self._archetypes['EnergySystemCatalog']['energy_generation_components']['boilers']
-    print(len(boilers))
     heat_pumps = self._archetypes['EnergySystemCatalog']['energy_generation_components']['heatPumps']
-    print(len(heat_pumps))
     photovoltaics = self._archetypes['EnergySystemCatalog']['energy_generation_components']['photovoltaicModules']
-    print(len(photovoltaics))
     templates = self._archetypes['EnergySystemCatalog']['energy_generation_components']['templateGenerationEquipments']
-    print(len(templates))
     for boiler in boilers:
-      print(boiler)
       boiler_id = boiler['@generation_id']
       name = boiler['@name']
       system_type = 'Boiler'
@@ -175,7 +170,8 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                                    source_medium=source_medium,
                                                    supply_medium=supply_medium,
                                                    fuel_type=fuel_type,
-                                                   heat_efficiency=heat_efficiency)
+                                                   heat_efficiency=heat_efficiency,
+                                                   energy_storage_systems=energy_storage_system)
         generation_components.append(heat_pump_template)
       else:
         electricity_efficiency = float(template['@nominalEfficiency'])
diff --git a/tests/test_systems_catalog.py b/tests/test_systems_catalog.py
index 87634a73..0178b007 100644
--- a/tests/test_systems_catalog.py
+++ b/tests/test_systems_catalog.py
@@ -54,4 +54,4 @@ class TestSystemsCatalog(TestCase):
 
     with self.assertRaises(IndexError):
       catalog.get_entry('unknown')
-
+    print(catalog.entries())