diff --git a/config/cmb.services.yaml b/config/cmb.services.yaml
index 4ea4926c..c069dc5f 100644
--- a/config/cmb.services.yaml
+++ b/config/cmb.services.yaml
@@ -185,6 +185,14 @@ services:
     # rider assignment interface
     App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\CMBRiderAssignmentHandler"
 
+    # rider API service
+    App\Service\RiderAPIHandler\CMBRiderAPIHandler:
+        arguments:
+            $country_code: "%env(COUNTRY_CODE)%"
+    
+    # rider API interface
+    App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\CMBRiderAPIHandler"
+
     # map manager
     #App\Service\GISManager\Bing: ~
     App\Service\GISManager\OpenStreet: ~
diff --git a/config/resq.services.yaml b/config/resq.services.yaml
index eabe0b67..1756cf98 100644
--- a/config/resq.services.yaml
+++ b/config/resq.services.yaml
@@ -185,6 +185,13 @@ services:
     # rider assignment interface
     App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\ResqRiderAssignmentHandler"
 
+    # rider API service
+    App\Service\RiderAPIHandler\ResqRiderAPIHandler: 
+        arguments:
+            $country_code: "%env(COUNTRY_CODE)%" 
+
+    App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\ResqRiderAPIHandler"
+    
     # map manager
     #App\Service\GISManager\Bing: ~
     App\Service\GISManager\OpenStreet: ~
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 534b986a..6a2c1dbe 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -2324,6 +2324,14 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         return $params;
     }
 
+    public function checkIfNewBattery(JobOrder $jo)
+    {
+        if ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW)
+            return true;
+
+        return false;
+    }
+
     protected function fillDropdownParameters(&$params)
     {
         $em = $this->em;
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 2badddaa..27613739 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2283,6 +2283,14 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             ->setWarrantyExpiration($warr_date);
     }
 
+    public function checkIfNewBattery(JobOrder $jo)
+    {
+        if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
+            return true;
+
+        return false;
+    }
+
     protected function fillDropdownParameters(&$params)
     {
         $em = $this->em;
diff --git a/src/Service/JobOrderHandlerInterface.php b/src/Service/JobOrderHandlerInterface.php
index 92eb40da..5593d10c 100644
--- a/src/Service/JobOrderHandlerInterface.php
+++ b/src/Service/JobOrderHandlerInterface.php
@@ -95,4 +95,7 @@ interface JobOrderHandlerInterface
 
     // update customer vehicle battery warranty info
     public function updateVehicleBattery(JobOrder $jo);
+
+    // check if service type is new battery
+    public function checkIfNewBattery(JobOrder $jo);
 }
diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index fa416e27..fb84d77d 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -524,7 +524,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         $this->em->flush();
 
         // create warranty
-        if ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
+        if($this->jo_handler->checkIfNewBattery($jo))
         {
             $serial = null;
             $warranty_class = $jo->getWarrantyClass();