diff --git a/hub/helpers/data/hub_function_to_eilat_construction_function.py b/hub/helpers/data/hub_function_to_eilat_construction_function.py
index 2e8cebc6..e978ac32 100644
--- a/hub/helpers/data/hub_function_to_eilat_construction_function.py
+++ b/hub/helpers/data/hub_function_to_eilat_construction_function.py
@@ -16,7 +16,9 @@ class HubFunctionToEilatConstructionFunction:
     self._dictionary = {
       cte.RESIDENTIAL: 'Residential_building',
       cte.HOTEL: 'Residential_building',
-      cte.DORMITORY: 'Residential_building'
+      cte.DORMITORY: 'Residential_building',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property
diff --git a/hub/helpers/data/hub_function_to_montreal_custom_costs_function.py b/hub/helpers/data/hub_function_to_montreal_custom_costs_function.py
index 06b2e16b..6c530aad 100644
--- a/hub/helpers/data/hub_function_to_montreal_custom_costs_function.py
+++ b/hub/helpers/data/hub_function_to_montreal_custom_costs_function.py
@@ -73,7 +73,9 @@ class HubFunctionToMontrealCustomCostsFunction:
       cte.AUTOMOTIVE_FACILITY: 'non-residential',
       cte.PARKING_GARAGE: 'non-residential',
       cte.RELIGIOUS: 'non-residential',
-      cte.NON_HEATED: 'non-residential'
+      cte.NON_HEATED: 'non-residential',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property
diff --git a/hub/helpers/data/hub_function_to_nrcan_construction_function.py b/hub/helpers/data/hub_function_to_nrcan_construction_function.py
index 8cec3715..d8618f07 100644
--- a/hub/helpers/data/hub_function_to_nrcan_construction_function.py
+++ b/hub/helpers/data/hub_function_to_nrcan_construction_function.py
@@ -72,7 +72,9 @@ class HubFunctionToNrcanConstructionFunction:
       cte.AUTOMOTIVE_FACILITY: 'n/a',
       cte.PARKING_GARAGE: 'n/a',
       cte.RELIGIOUS: 'n/a',
-      cte.NON_HEATED: 'n/a'
+      cte.NON_HEATED: 'n/a',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property
diff --git a/hub/helpers/data/hub_function_to_nrel_construction_function.py b/hub/helpers/data/hub_function_to_nrel_construction_function.py
index ca4144a3..39620b7b 100644
--- a/hub/helpers/data/hub_function_to_nrel_construction_function.py
+++ b/hub/helpers/data/hub_function_to_nrel_construction_function.py
@@ -73,7 +73,9 @@ class HubFunctionToNrelConstructionFunction:
       cte.AUTOMOTIVE_FACILITY: 'n/a',
       cte.PARKING_GARAGE: 'n/a',
       cte.RELIGIOUS: 'n/a',
-      cte.NON_HEATED: 'n/a'
+      cte.NON_HEATED: 'n/a',
+      cte.DATACENTER: 'n/a',
+      cte.FARM: 'n/a'
     }
 
   @property
diff --git a/hub/helpers/data/hub_usage_to_nrcan_usage.py b/hub/helpers/data/hub_usage_to_nrcan_usage.py
index 8be15d2e..e3868a6f 100644
--- a/hub/helpers/data/hub_usage_to_nrcan_usage.py
+++ b/hub/helpers/data/hub_usage_to_nrcan_usage.py
@@ -76,7 +76,6 @@ class HubUsageToNrcanUsage:
       cte.NON_HEATED: 'n/a',
       cte.DATACENTER: 'n/a',
       cte.FARM: 'n/a'
-
     }
 
   @property