diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl
index a4eca60..49071bf 100644
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -29,7 +29,7 @@
           "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
           "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
-          <#assign isCountryCode = isCountryCode(carrier.carrier_structured_address.country_code) />
+          <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code) />
           <#if isCountryCode>
             "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
           <#else>
diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl
index c6b463d..f0660d8 100644
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -29,7 +29,7 @@
         "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
         "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
         "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
-        <#assign isCountryCode = isCountryCode(actor.consignee_structured_address.country_code) />
+        <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code) />
          <#if isCountryCode>
             "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
           <#else>
diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl
index 071f916..39aeb39 100644
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -28,7 +28,7 @@
           "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
          "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
           "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
-          <#assign isCountryCode = isCountryCode(actor.supplier_structured_address.country_code) />
+          <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code) />
           <#if isCountryCode>
             "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
           <#else>
diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl
index db25bab..c80d1e3 100644
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -28,7 +28,7 @@
           "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
           "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
-          <#assign isCountryCode = isCountryCode(depot.physical_depot_structured_address.country_code) />
+          <#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code) />
           <#if isCountryCode >
             "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
           <#else>