diff --git a/src/Models/AbstractEmail.php b/src/Models/AbstractEmail.php
old mode 100644
new mode 100755
index 5dbba0e..f6fce55
--- a/src/Models/AbstractEmail.php
+++ b/src/Models/AbstractEmail.php
@@ -15,9 +15,9 @@
 
 use BadPixxel\SendinblueBridge\Services\SmtpManager;
 use Exception;
-use FOS\UserBundle\Model\UserInterface as User;
 use SendinBlue\Client\Model\CreateSmtpEmail;
 use SendinBlue\Client\Model\SendSmtpEmail;
+use Sonata\UserBundle\Model\UserInterface as User;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -158,6 +158,8 @@ protected function create(): self
     /**
      * Create a New Email and Populate Defaults Values.
      *
+     * @throws Exception
+     *
      * @return null|CreateSmtpEmail
      */
     protected function sendEmail(bool $demoMode): ?CreateSmtpEmail
@@ -179,6 +181,8 @@ protected function sendEmail(bool $demoMode): ?CreateSmtpEmail
     /**
      * Add User to Email To.
      *
+     * @param User $toUser
+     *
      * @return self
      */
     protected function addToUser(User $toUser): self
@@ -191,6 +195,8 @@ protected function addToUser(User $toUser): self
     /**
      * Add User to Email Cc.
      *
+     * @param User $ccUser
+     *
      * @return self
      */
     protected function addCcUser(User $ccUser): self
@@ -203,6 +209,8 @@ protected function addCcUser(User $ccUser): self
     /**
      * Add User to Email Bcc.
      *
+     * @param User $bccUser
+     *
      * @return self
      */
     protected function addBccUser(User $bccUser): self
@@ -285,7 +293,7 @@ private static function addUserEmail(?array $emailList, User $toUser): array
         // Extract User Name
         $name = method_exists($toUser, "__toString")
             ? $toUser->__toString()
-            : $toUser->getUsername()
+            : $toUser->getUserIdentifier()
         ;
         //==============================================================================
         // Create To User Array
@@ -295,7 +303,7 @@ private static function addUserEmail(?array $emailList, User $toUser): array
         ));
         //==============================================================================
         // Push User to List
-        if (is_null($emailList) || empty($emailList)) {
+        if (empty($emailList)) {
             return $emailUser;
         }
 
diff --git a/src/Models/AbstractEmailAdmin.php b/src/Models/AbstractEmailAdmin.php
old mode 100644
new mode 100755
diff --git a/src/Models/AbstractSms.php b/src/Models/AbstractSms.php
old mode 100644
new mode 100755
index 85ca044..c66789d
--- a/src/Models/AbstractSms.php
+++ b/src/Models/AbstractSms.php
@@ -15,9 +15,9 @@
 
 use BadPixxel\SendinblueBridge\Services\SmsManager;
 use Exception;
-use FOS\UserBundle\Model\UserInterface as User;
 use SendinBlue\Client\Model\SendSms;
 use SendinBlue\Client\Model\SendTransacSms;
+use Sonata\UserBundle\Model\UserInterface as User;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
diff --git a/src/Models/AbstractSmsAdmin.php b/src/Models/AbstractSmsAdmin.php
old mode 100644
new mode 100755
diff --git a/src/Models/AbstractTrackEvent.php b/src/Models/AbstractTrackEvent.php
old mode 100644
new mode 100755
index 6bde017..89e3b07
--- a/src/Models/AbstractTrackEvent.php
+++ b/src/Models/AbstractTrackEvent.php
@@ -15,7 +15,7 @@
 
 use BadPixxel\SendinblueBridge\Services\EventManager;
 use Exception;
-use FOS\UserBundle\Model\UserInterface as User;
+use Sonata\UserBundle\Model\UserInterface as User;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -28,28 +28,28 @@ abstract class AbstractTrackEvent
      *
      * @var string
      */
-    protected $type = "myEventCode";
+    protected string $type = "myEventCode";
 
     /**
      * User Email.
      *
      * @var string
      */
-    protected $userEmail;
+    protected string $userEmail;
 
     /**
      * Default Properties.
      *
      * @var array
      */
-    protected $propertiesDefaults = array();
+    protected array $propertiesDefaults = array();
 
     /**
      * Default Event Data.
      *
      * @var array
      */
-    protected $eventDataDefaults = array();
+    protected array $eventDataDefaults = array();
 
     /**
      * Event Properties.
@@ -59,7 +59,7 @@ abstract class AbstractTrackEvent
      *
      * @var null|array<string, string>
      */
-    private $properties;
+    private ?array $properties;
 
     /**
      * Event Data.
@@ -69,7 +69,7 @@ abstract class AbstractTrackEvent
      *
      * @var null|array<string, string>
      */
-    private $eventdata;
+    private ?array $eventdata;
 
     /**
      * Construct the Event.
@@ -110,10 +110,12 @@ public static function send(User $user): bool
     }
 
     /**
-     * Send a Transactionnal Test/Demo Event.
+     * Send a Transactional Test/Demo Event.
      *
      * @param User $user Target User
      *
+     * @throws Exception
+     *
      * @return bool
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -171,11 +173,13 @@ public static function getLastError(): string
     /**
      * Set Event User
      *
+     * @param User $user
+     *
      * @return self
      */
     public function setUser(User $user): self
     {
-        $this->userEmail = $user->getEmailCanonical();
+        $this->userEmail = (string) $user->getEmailCanonical();
 
         return $this;
     }
diff --git a/src/Models/User/EmailsTrait.php b/src/Models/User/EmailsTrait.php
old mode 100644
new mode 100755
diff --git a/src/Models/User/SmsTrait.php b/src/Models/User/SmsTrait.php
old mode 100644
new mode 100755
diff --git a/src/Models/UserEmails/ContentsTrait.php b/src/Models/UserEmails/ContentsTrait.php
old mode 100644
new mode 100755
diff --git a/src/Models/UserEmails/MetadataTrait.php b/src/Models/UserEmails/MetadataTrait.php
old mode 100644
new mode 100755