diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Admin.h b/Trenser.Zenvy/Trenser.Zenvy/models/Admin.h
index b729750..fdd5daa 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Admin.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Admin.h
@@ -4,7 +4,6 @@
  * Author: Trenser
  * Created: 31-Mar-2026
  */
-
 #pragma once
 #include "Employee.h"
 
@@ -16,7 +15,7 @@ public:
         const std::string& name,
         const std::string& phone,
         const std::string& email,
-        std::shared_ptr<Payroll> payroll
+        Payroll* payroll
     ) :Employee(name, phone, email, Enums::EmployeeType::ADMIN, payroll) {};
     Admin(const std::string& id,
         const std::string& name,
@@ -36,4 +35,4 @@ public:
             Enums::EmployeeType::ADMIN,
             accountStatus) {}
     ~Admin() = default;
-};
+};
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Employee.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Employee.cpp
index 45b9d79..f34534f 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Employee.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Employee.cpp
@@ -189,7 +189,7 @@ std::string Employee::serialize() const
     return serializedEmployee.str();
 }
 
-std::shared_ptr<Employee> Employee::deserialize(const std::string& record)
+Employee* Employee::deserialize(const std::string& record)
 {
     std::string id, name, phone, password, email;
     std::string teamId, teamStatusString, accountStatusString, employeeTypeString;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Employee.h b/Trenser.Zenvy/Trenser.Zenvy/models/Employee.h
index b10f86e..640a9be 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Employee.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Employee.h
@@ -94,7 +94,7 @@ public:
     void addLeave(Leave* leave);
     Enums::EmployeeType getEmployeeType() const;
     virtual std::string serialize() const;
-    static std::shared_ptr<Employee> deserialize(const std::string&);
+    static Employee* deserialize(const std::string&);
     static std::string getHeaders();
     virtual ~Employee() = default;
 };
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/FinanceExecutive.h b/Trenser.Zenvy/Trenser.Zenvy/models/FinanceExecutive.h
index fa69c08..3a899d9 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/FinanceExecutive.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/FinanceExecutive.h
@@ -15,7 +15,7 @@ public:
         const std::string& name,
         const std::string& phone,
         const std::string& email,
-        std::shared_ptr<Payroll> payroll
+        Payroll* payroll
 	) :Employee(name, phone, email, Enums::EmployeeType::FINANCE, payroll) {};
   FinanceExecutive(const std::string& id,
         const std::string& name,
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.cpp
index 5005753..8ce81ba 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.cpp
@@ -34,7 +34,7 @@ std::string GeneralEmployee::serialize() const
     return serializedEmployee.str();
 }
 
-std::shared_ptr<GeneralEmployee> GeneralEmployee::deserialize(const std::string& record)
+GeneralEmployee* GeneralEmployee::deserialize(const std::string& record)
 {
     std::string id, name, phone, password, email;
     std::string teamId, teamStatusString, accountStatusString, employeeTypeString, employeeDesignationString;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.h b/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.h
index 3947f12..885349c 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/GeneralEmployee.h
@@ -48,7 +48,7 @@ public:
     Enums::EmployeeDesignation getDesignation() const;
     void setDesignation(Enums::EmployeeDesignation designation);
     std::string serialize() const override;
-    static std::shared_ptr<GeneralEmployee> deserialize(const std::string&);
+    static GeneralEmployee* deserialize(const std::string&);
     static std::string getHeaders();
     ~GeneralEmployee() = default;
 };
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/HRManager.h b/Trenser.Zenvy/Trenser.Zenvy/models/HRManager.h
index a912b3f..41fa740 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/HRManager.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/HRManager.h
@@ -15,7 +15,7 @@ public:
         const std::string& name,
         const std::string& phone,
         const std::string& email,
-        std::shared_ptr<Payroll> payroll
+        Payroll* payroll
     ) :Employee(name, phone, email, Enums::EmployeeType::HR, payroll) {};
     HRManager(const std::string& id,
         const std::string& name,
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/ITExecutive.h b/Trenser.Zenvy/Trenser.Zenvy/models/ITExecutive.h
index 4a48b5e..9d02cd1 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/ITExecutive.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/ITExecutive.h
@@ -15,7 +15,7 @@ public:
         const std::string& name,
         const std::string& phone,
         const std::string& email,
-        std::shared_ptr<Payroll> payroll
+        Payroll* payroll
     ) :Employee(name, phone, email, Enums::EmployeeType::IT, payroll) {};
     ITExecutive(const std::string& id,
         const std::string& name,
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.cpp
index 33c85e0..ecb91d4 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.cpp
@@ -4,7 +4,6 @@ File: JobListing.cpp
 * Author : Trenser
 * Created : 01-Apr-2026
 */
-
 #include "JobListing.h"
 
 int JobListing::m_uid = 0;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.h b/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.h
index 48f3ee7..3332b08 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/JobListing.h
@@ -4,7 +4,6 @@ File: JobListing.h
 * Author : Trenser
 * Created : 01-Apr-2026
 */
-
 #pragma once
 #include <string>
 #include <map>
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Leave.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Leave.cpp
index e7d4577..3519d1e 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Leave.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Leave.cpp
@@ -4,7 +4,6 @@ File: Leave.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "Leave.h"
 
 int Leave::m_uid = 0;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Leave.h b/Trenser.Zenvy/Trenser.Zenvy/models/Leave.h
index a7cad19..1da66ca 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Leave.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Leave.h
@@ -4,7 +4,6 @@ File: Leave.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <string>
 #include "Enums.h"
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Log.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Log.cpp
index af1e9e2..15ff4ce 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Log.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Log.cpp
@@ -4,7 +4,6 @@ File: Log.cpp
 * Author : Trenser
 * Created : 01-Apr-2026
 */
-
 #include "Log.h"
 
 //Getters and setters
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Log.h b/Trenser.Zenvy/Trenser.Zenvy/models/Log.h
index f258643..cfb830d 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Log.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Log.h
@@ -4,7 +4,6 @@ File: Log.h
 * Author : Trenser
 * Created : 01-Apr-2026
 */
-
 #pragma once
 #include <string>
 #include "Timestamp.h"
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Notification.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Notification.cpp
index 4527e2e..3da5d9b 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Notification.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Notification.cpp
@@ -4,7 +4,6 @@ File: Notification.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "Notification.h"
 
 int Notification::m_uid = 0;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Notification.h b/Trenser.Zenvy/Trenser.Zenvy/models/Notification.h
index fa3e5a0..196078a 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Notification.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Notification.h
@@ -4,7 +4,6 @@ File: Notification.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <string>
 #include "Enums.h"
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.cpp
index 99a0e90..7ed278b 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.cpp
@@ -4,7 +4,6 @@ File: Payroll.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "Payroll.h"
 #include "StringHelper.h"
 #include "Factory.h"
@@ -111,7 +110,7 @@ std::string Payroll::serialize() const
     return serializedPayroll.str();
 }
 
-std::shared_ptr<Payroll> Payroll::deserialize(const std::string& record)
+Payroll* Payroll::deserialize(const std::string& record)
 {
     std::string id, employeeId;
     std::string basicSalaryString, houseRentAllowanceString, foodAllowanceString, employeePFString, employerPFString;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.h b/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.h
index fbb360d..cb5e74b 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Payroll.h
@@ -4,7 +4,6 @@ File: Payroll.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <string>
 #include <memory>
@@ -62,6 +61,6 @@ public:
     void setEmployeePFContribution(double);
     void setEmployerPFContribution(double);
     std::string serialize() const;
-    static std::shared_ptr<Payroll> deserialize(const std::string&);
+    static Payroll* deserialize(const std::string&);
     static std::string getHeaders();
 };
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.cpp
index 1c20103..e0198f2 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.cpp
@@ -4,7 +4,6 @@ File: Payslip.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include <sstream>
 #include "Payslip.h"
 #include "StringHelper.h"
@@ -68,7 +67,7 @@ std::string Payslip::serialize() const
     return serializedPayslip.str();
 }
 
-std::shared_ptr<Payslip> Payslip::deserialize(const std::string& record)
+Payslip* Payslip::deserialize(const std::string& record)
 {
     std::string id, employeeId, timestampString;
     std::string salaryString;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.h b/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.h
index 1b27587..7144570 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Payslip.h
@@ -4,7 +4,6 @@ File: Payslip.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <memory>
 #include <string>
@@ -32,6 +31,6 @@ public:
     const util::Timestamp& getTimestamp() const;
     const std::string& getEmployeeId() const;
     std::string serialize() const;
-    static std::shared_ptr<Payslip> deserialize(const std::string&);
+    static Payslip* deserialize(const std::string&);
     static std::string getHeaders();
 };
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Room.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Room.cpp
index 364bd69..b760a32 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Room.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Room.cpp
@@ -4,7 +4,6 @@ File: Room.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "Room.h"
 
 int Room::m_uid = 0;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Room.h b/Trenser.Zenvy/Trenser.Zenvy/models/Room.h
index 23e3f95..3eb6934 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Room.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Room.h
@@ -4,7 +4,6 @@ File: Room.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <string>
 #include <map>
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.cpp
index 5c44816..7023cd6 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.cpp
@@ -4,5 +4,4 @@ File: TalentExecutive.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "TalentExecutive.h"
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.h b/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.h
index 6f7c9ca..06b31a4 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/TalentExecutive.h
@@ -4,7 +4,6 @@ File: TalentExecutive.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include "Employee.h"
 
@@ -16,7 +15,7 @@ public:
         const std::string& name,
         const std::string& phone,
         const std::string& email,
-        std::shared_ptr<Payroll> payroll
+        Payroll* payroll
     ) :Employee(name, phone, email, Enums::EmployeeType::TALENT_ACQUISITION, payroll) {};
     TalentExecutive(const std::string& id,
         const std::string& name,
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Team.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Team.cpp
index 7aa1c97..5168acb 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Team.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Team.cpp
@@ -4,7 +4,6 @@ File: Team.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "Team.h"
 
 int Team::m_uid = 0;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Team.h b/Trenser.Zenvy/Trenser.Zenvy/models/Team.h
index 25937a5..9296243 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Team.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Team.h
@@ -4,7 +4,6 @@ File: Team.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <string>
 #include <map>
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.cpp
index c780ad7..91d1691 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.cpp
@@ -4,5 +4,4 @@ File: TeamExecutive.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "TeamExecutive.h"
\ No newline at end of file
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.h b/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.h
index 2fc41f1..84e1b3f 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/TeamExecutive.h
@@ -4,7 +4,6 @@ File: TeamExecutive.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include "Employee.h"
 
@@ -16,7 +15,7 @@ public:
         const std::string& name,
         const std::string& phone,
         const std::string& email,
-        std::shared_ptr<Payroll> payroll
+        Payroll* payroll
     ) :Employee(name, phone, email, Enums::EmployeeType::TEAM, payroll) {};
     TeamExecutive(const std::string& id,
         const std::string& name,
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.cpp b/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.cpp
index 58fc5b7..a07174e 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.cpp
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.cpp
@@ -4,7 +4,6 @@ File: Ticket.cpp
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #include "Ticket.h"
 
 int Ticket::m_uid = 0;
diff --git a/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.h b/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.h
index a4ec474..ba5f25e 100644
--- a/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.h
+++ b/Trenser.Zenvy/Trenser.Zenvy/models/Ticket.h
@@ -4,7 +4,6 @@ File: Ticket.h
 * Author : Trenser
 * Created : 31-Mar-2026
 */
-
 #pragma once
 #include <string>
 #include "Enums.h"