diff --git a/src/Chapaar.php b/src/Chapaar.php
index a88f39e..6618d2d 100755
--- a/src/Chapaar.php
+++ b/src/Chapaar.php
@@ -26,8 +26,8 @@ public function getDefaultDriver(): DriverConnector
     public function send($message): object
     {
         $response = $this->driver($message->getDriver())->send($message);
-        if(config('chapaar.store_sms_messages') && count($response)) {
-            SmsSent::dispatch($message->driver,$message,$response['status']);
+        if(config('chapaar.store_sms_messages')) {
+            SmsSent::dispatch($response);
         }
         return $response;
 
@@ -36,8 +36,8 @@ public function send($message): object
     public function verify(DriverMessage $message): object
     {
         $response = $this->driver($message->getDriver())->verify($message);
-        if(config('chapaar.store_sms_messages') && count($response)) {
-            SmsSent::dispatch($message->getDriver(),$message,$response['status']);
+        if(config('chapaar.store_sms_messages')) { 
+            SmsSent::dispatch($response);
         }
         return $response;
     }
diff --git a/src/Contracts/DriverConnector.php b/src/Contracts/DriverConnector.php
index 61005f8..2021e14 100644
--- a/src/Contracts/DriverConnector.php
+++ b/src/Contracts/DriverConnector.php
@@ -21,7 +21,7 @@ public function verify($message);
 
     public function outbox($page_size = 100, $page_number = 1): object;
 
-    public function generateResponse(int $status, string $message, array $data = null): object;
+    public function generateResponse(int $status, string $message, string $driver, array $data = null): object;
 
     public function generateAccountResponse($credit, $expire_date): object;
 
diff --git a/src/Models/SmsMessage.php b/src/Models/SmsMessage.php
index a83f663..9807117 100644
--- a/src/Models/SmsMessage.php
+++ b/src/Models/SmsMessage.php
@@ -4,16 +4,18 @@
 
 use Illuminate\Database\Eloquent\Casts\AsCollection;
 use Illuminate\Database\Eloquent\Model;
+use TookanTech\Chapaar\Enums\Drivers;
 
 class SmsMessage extends Model
 {
     protected $fillable = [
-        'provider',
+        'driver',
         'data',
         'status',
     ];
 
-    protected $cast = [
+    protected $casts = [
+        'driver' => Drivers::class,
         'data' => AsCollection::class
-    ]
+    ];
 }