diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index cef5e10f..1d796e3f 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -8,6 +8,8 @@ use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 
 use App\Ramcar\CMBServiceType;
 use App\Ramcar\CMBTradeInType;
+use App\Ramcar\JOStatus;
+use App\Ramcar\JOEventType;
 
 use App\Service\RiderAPIHandlerInterface;
 use App\Service\RedisClientProvider;
@@ -16,6 +18,9 @@ use App\Service\RiderCache;
 use App\Entity\RiderSession;
 use App\Entity\Rider;
 use App\Entity\User;
+use App\Entity\JOEvent;
+
+use DateTime;
 
 class CMBRiderAPIHandler implements RiderAPIHandlerInterface
 {
diff --git a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
index de36bdf1..d45a7e9d 100644
--- a/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
@@ -8,6 +8,8 @@ use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 
 use App\Ramcar\ServiceType;
 use App\Ramcar\TradeInType;
+use App\Ramcar\JOStatus;
+use App\Ramcar\JOEventType;
 
 use App\Service\RiderAPIHandlerInterface;
 use App\Service\RedisClientProvider;
@@ -16,6 +18,9 @@ use App\Service\RiderCache;
 use App\Entity\RiderSession;
 use App\Entity\Rider;
 use App\Entity\User;
+use App\Entity\JOEvent;
+
+use DateTime;
 
 class ResqRiderAPIHandler implements RiderAPIHandlerInterface
 {