diff --git a/imports/energy_systems_factory.py b/imports/energy_systems_factory.py
index 964353e7..466ff936 100644
--- a/imports/energy_systems_factory.py
+++ b/imports/energy_systems_factory.py
@@ -2,9 +2,11 @@
 EnergySystemsFactory retrieve the energy system module for the given region
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Pilar Monsalvete pilar.monsalvete@concordi.ca
+Contributor Peter Yefi peteryefi@gmail.com
 """
 from pathlib import Path
-from imports.energy_systems.xlsx_heat_pump_parameters import XlsxHeatPumpParameters
+from imports.energy_systems.air_source_hp_parameters import AirSourceHeatPumpParameters
+from imports.energy_systems.water_to_water_hp_parameters import WaterToWaterHPParameters
 
 
 class EnergySystemsFactory:
@@ -19,11 +21,17 @@ class EnergySystemsFactory:
     self._city = city
     self._base_path = base_path
 
-  def _xlsx_heat_pump(self):
+  def _air_source_hp(self):
     """
     Enrich the city by using xlsx heat pump information
     """
-    XlsxHeatPumpParameters(self._city, self._base_path).enrich_city()
+    AirSourceHeatPumpParameters(self._city, self._base_path).enrich_city()
+
+  def _water_to_water_hp(self):
+    """
+    Enrich the city by using water to water heat pump information
+    """
+    WaterToWaterHPParameters(self._city, self._base_path).enrich_city()
 
   def enrich(self):
     """