diff --git a/src/Services/AuditService.php b/src/Services/AuditService.php
index 642cb3c..1cf756b 100644
--- a/src/Services/AuditService.php
+++ b/src/Services/AuditService.php
@@ -9,8 +9,10 @@
  * @package Fintech\Auth\Services
  *
  */
-class AuditService extends \Fintech\Core\Abstracts\Service
+class AuditService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * AuditService constructor.
      * @param AuditRepository $auditRepository
diff --git a/src/Services/FavouriteService.php b/src/Services/FavouriteService.php
index 5065b07..261e0b0 100644
--- a/src/Services/FavouriteService.php
+++ b/src/Services/FavouriteService.php
@@ -9,8 +9,10 @@
  * @package Fintech\Auth\Services
  *
  */
-class FavouriteService extends \Fintech\Core\Abstracts\Service
+class FavouriteService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * FavouriteService constructor.
      * @param FavouriteRepository $favouriteRepository
diff --git a/src/Services/GeoIpService.php b/src/Services/GeoIpService.php
index c38b869..16d97c8 100644
--- a/src/Services/GeoIpService.php
+++ b/src/Services/GeoIpService.php
@@ -10,8 +10,10 @@
  * @package Fintech\Auth\Services
  *
  */
-class GeoIpService extends \Fintech\Core\Abstracts\Service
+class GeoIpService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     public function __construct(private readonly GeoIp $driver)
     {
 
diff --git a/src/Services/LoginAttemptService.php b/src/Services/LoginAttemptService.php
index 3bde1db..3c12af3 100644
--- a/src/Services/LoginAttemptService.php
+++ b/src/Services/LoginAttemptService.php
@@ -9,8 +9,10 @@
  * @package Fintech\Auth\Services
  *
  */
-class LoginAttemptService extends \Fintech\Core\Abstracts\Service
+class LoginAttemptService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * LoginAttemptService constructor.
      * @param LoginAttemptRepository $loginAttemptRepository
diff --git a/src/Services/OneTimePinService.php b/src/Services/OneTimePinService.php
index 8f00b7e..5a9307a 100644
--- a/src/Services/OneTimePinService.php
+++ b/src/Services/OneTimePinService.php
@@ -13,8 +13,10 @@
  * Class PermissionService
  *
  */
-class OneTimePinService extends \Fintech\Core\Abstracts\Service
+class OneTimePinService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     private string $otpMethod;
 
     /**
diff --git a/src/Services/PasswordResetService.php b/src/Services/PasswordResetService.php
index c3526b6..fdc3c63 100644
--- a/src/Services/PasswordResetService.php
+++ b/src/Services/PasswordResetService.php
@@ -18,8 +18,10 @@
  * Class PermissionService
  *
  */
-class PasswordResetService extends \Fintech\Core\Abstracts\Service
+class PasswordResetService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * @var mixed|string
      */
diff --git a/src/Services/PermissionService.php b/src/Services/PermissionService.php
index eb01333..5ef050f 100644
--- a/src/Services/PermissionService.php
+++ b/src/Services/PermissionService.php
@@ -8,8 +8,10 @@
  * Class PermissionService
  *
  */
-class PermissionService extends \Fintech\Core\Abstracts\Service
+class PermissionService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * PermissionService constructor.
      * @param PermissionRepository $permissionRepository
diff --git a/src/Services/PinResetService.php b/src/Services/PinResetService.php
index 1146c12..5351368 100644
--- a/src/Services/PinResetService.php
+++ b/src/Services/PinResetService.php
@@ -18,8 +18,10 @@
  * Class PermissionService
  *
  */
-class PinResetService extends \Fintech\Core\Abstracts\Service
+class PinResetService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * @var mixed|string
      */
diff --git a/src/Services/ProfileService.php b/src/Services/ProfileService.php
index d2409b3..d6dcf98 100644
--- a/src/Services/ProfileService.php
+++ b/src/Services/ProfileService.php
@@ -18,8 +18,10 @@
  * Class UserService
  *
  */
-class ProfileService extends \Fintech\Core\Abstracts\Service
+class ProfileService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * UserService constructor.
      * @param ProfileRepository $profileRepository
diff --git a/src/Services/RoleService.php b/src/Services/RoleService.php
index 87b4803..a28ec62 100644
--- a/src/Services/RoleService.php
+++ b/src/Services/RoleService.php
@@ -8,8 +8,10 @@
  * Class RoleService
  *
  */
-class RoleService extends \Fintech\Core\Abstracts\Service
+class RoleService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * RoleService constructor.
      * @param RoleRepository $roleRepository
diff --git a/src/Services/TeamService.php b/src/Services/TeamService.php
index 551e488..f7aeef3 100644
--- a/src/Services/TeamService.php
+++ b/src/Services/TeamService.php
@@ -8,8 +8,10 @@
  * Class TeamService
  *
  */
-class TeamService extends \Fintech\Core\Abstracts\Service
+class TeamService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     /**
      * TeamService constructor.
      * @param TeamRepository $teamRepository
diff --git a/src/Services/UserService.php b/src/Services/UserService.php
index 7780050..aa3a26b 100644
--- a/src/Services/UserService.php
+++ b/src/Services/UserService.php
@@ -30,8 +30,10 @@
  * Class UserService
  *
  */
-class UserService extends \Fintech\Core\Abstracts\Service
+class UserService
 {
+    use \Fintech\Core\Traits\HasFindWhereSearch;
+
     private array $loginAttempt;
 
     /**