diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 7ebb351..a0a04eb 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -55,6 +55,8 @@ $routes->group('api', ['filter' => 'appSignature'], function ($routes) {
 
     //Staff
     $routes->get('staff/staffList', 'StaffController::staffList');
+    $routes->get('staff/staffListForEnquiryAssignDropdown', 'StaffController::staffListForEnquiryAssignDropdown');
+    $routes->get('staff/handlerListForStaffCreationDropdown', 'StaffController::handlerListForStaffCreationDropdown');
     $routes->get('staff/findStaff', 'StaffController::findStaff');
     $routes->post('staff/createStaff', 'StaffController::createStaff');
     $routes->post('staff/updateStaff', 'StaffController::updateStaff');
diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php
index 6207e50..c6f8bb3 100644
--- a/app/Controllers/EnquiryController.php
+++ b/app/Controllers/EnquiryController.php
@@ -298,8 +298,14 @@ class EnquiryController extends ResourceController
                 return $this->respond(['status' => 'failed', 'code' => 200, 'error' => 'Data Not Found'], 200);
             }
 
+            //get insurer_branch_id
+            $query = $this->db->query("SELECT id FROM insurer_branch WHERE insurer_id = ? LIMIT 1", [$data['insurer_id']]);
+            $insurerBranchresult = $query->getRowArray();
+
             $updateData = [
-                'assigned_to'      => $data['assigned_to']
+                'assigned_to'      => $data['assigned_to'],
+                'insurer_id'       => $data['insurer_id'],
+                'insurer_branch_id'=> $insurerBranchresult['id'] ?? 0,
             ];
 
             $this->enquiryModel->update($id, $updateData);
diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php
index 06193c9..7fcbc9d 100644
--- a/app/Controllers/StaffController.php
+++ b/app/Controllers/StaffController.php
@@ -21,12 +21,25 @@ class StaffController extends ResourceController
     public function staffList()
     {
         try{
-            $id = $this->request->getGet('manager_id');
+            $manager_id = $this->request->getGet('manager_id');
+            $handler_id = $this->request->getGet('handler_id');
 
-            $data = $this->StaffModel->select('partner_staff.* , R.role')
-                                    ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
-                                    ->where('partner_staff.manager_id' , $id )
-                                    ->findAll();
+            if(!empty($manager_id))
+            {
+                $data = $this->StaffModel->select('partner_staff.* , R.role')
+                ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                ->where('partner_staff.manager_id' , $manager_id )
+                ->findAll();
+
+            }else{
+
+                $data = $this->StaffModel->select('partner_staff.* , R.role')
+                ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                ->where('partner_staff.handler_id' , $handler_id )
+                ->findAll();
+            }
+
+           
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 
@@ -36,6 +49,45 @@ class StaffController extends ResourceController
        
     }
 
+    public function staffListForEnquiryAssignDropdown()
+    {
+        try{
+            $id = $this->request->getGet('handler_id');
+
+            $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                                    ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                                    ->where('partner_staff.handler_id' , $id )
+                                    ->where('partner_staff.is_active' , 1 )
+                                    ->findAll();
+
+            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
+
+        } catch (\Exception $e) {
+            return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
+        }
+        
+    }
+
+    public function handlerListForStaffCreationDropdown()
+    {
+        try{
+            $manager_id = $this->request->getGet('manager_id');
+
+            $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                                    ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                                    ->where('partner_staff.handler_id' , $manager_id )
+                                    ->where('partner_staff.role_id' , 2 )
+                                    ->where('partner_staff.is_active' , 1 )
+                                    ->findAll();
+
+            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
+
+        } catch (\Exception $e) {
+            return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
+        }
+        
+    }
+
     // Find a Staff
     public function findStaff()
     {
@@ -68,6 +120,7 @@ class StaffController extends ResourceController
                 'mobile'                => $data['mobile'],
                 'role_id'               => $data['role_id'],
                 'manager_id'            => $data['manager_id'],
+                'handler_id'            => $data['handler_id'] ?? null,
                 'emp_id'                => $data['emp_id'],
                 'created_by'            => $data['created_by']
             ];
@@ -102,11 +155,12 @@ class StaffController extends ResourceController
 
             
             $updateData = [
-                'name'                  => $data['name'],
-                'email'                 => $data['email'],
-                'mobile'                => $data['mobile'],
-                'role_id'               => $data['role_id'] ?? null,
+                'name'                 => $data['name'],
+                'email'                => $data['email'],
+                'mobile'               => $data['mobile'],
+                'role_id'              => $data['role_id'] ?? null,
                 'emp_id'               => $data['emp_id'] ?? null,
+                'handler_id'           => $data['handler_id'] ?? null,
                 'updated_by' => $data['updated_by'] ?? null,
             ];
 
diff --git a/app/Helpers/mail_helper.php b/app/Helpers/mail_helper.php
index 4914897..f7da95f 100644
--- a/app/Helpers/mail_helper.php
+++ b/app/Helpers/mail_helper.php
@@ -44,7 +44,7 @@ if (!function_exists('trigger_email')) {
 
                     $to_email = $staffData['email'];
                     $subject  = "New Enquiry Created";
-                    $message  = "<p>A new enquiry has been created by {$agentData['name']}.</p>";
+                    $message  = "<p>A new Enquiry #{$data['enquiry_id']} has been created by {$agentData['name']}.</p>";
                     break;
 
                 case 'enquiry_assigned':
diff --git a/app/Models/EnquiryModel.php b/app/Models/EnquiryModel.php
index 9c7ffec..0bac900 100644
--- a/app/Models/EnquiryModel.php
+++ b/app/Models/EnquiryModel.php
@@ -24,6 +24,8 @@ class EnquiryModel extends Model
         'is_active',
         'manager_id',
         'assigned_to',
+        'insurer_id',
+        'insurer_branch_id',
         'created_by',
         'updated_by'
     ];
diff --git a/app/Models/StaffModel.php b/app/Models/StaffModel.php
index 0ffa893..6fa9f18 100644
--- a/app/Models/StaffModel.php
+++ b/app/Models/StaffModel.php
@@ -15,6 +15,7 @@ class StaffModel extends Model
         'emp_id',
         'role_id',
         'manager_id',
+        'handler_id',
         'email_otp',
         'is_active',
         'created_by',