diff --git a/Marco.Pms.Model/Activities/TaskImages.cs b/Marco.Pms.Model/Activities/TaskImages.cs
index 1cd93a2..fd82c18 100644
--- a/Marco.Pms.Model/Activities/TaskImages.cs
+++ b/Marco.Pms.Model/Activities/TaskImages.cs
@@ -10,8 +10,8 @@ namespace Marco.Pms.Model.Activities
         public long TaskAllocationId { get; set; }
         [ValidateNever]
         [ForeignKey(nameof(TaskAllocationId))]
-        public TaskAllocation TaskAllocation { get; set; }
+        public TaskAllocation? TaskAllocation { get; set; }
 
-        public string ImagePath { get; set; }
+        public string? ImagePath { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/AttendanceModule/AttendanceLog.cs b/Marco.Pms.Model/AttendanceModule/AttendanceLog.cs
index 6acf3f1..2376ce0 100644
--- a/Marco.Pms.Model/AttendanceModule/AttendanceLog.cs
+++ b/Marco.Pms.Model/AttendanceModule/AttendanceLog.cs
@@ -1,9 +1,9 @@
-using Marco.Pms.Model.Dtos.Attendance;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
+using Marco.Pms.Model.Dtos.Attendance;
 using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Entitlements;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations.Schema;
 
 
 namespace Marco.Pms.Model.AttendanceModule
diff --git a/Marco.Pms.Model/Authentication/JwtSettings.cs b/Marco.Pms.Model/Authentication/JwtSettings.cs
index 8e303ee..d443b3a 100644
--- a/Marco.Pms.Model/Authentication/JwtSettings.cs
+++ b/Marco.Pms.Model/Authentication/JwtSettings.cs
@@ -2,9 +2,9 @@
 {
     public class JwtSettings
     {
-        public string Key { get; set; }
-        public string Issuer { get; set; }
-        public string Audience { get; set; }
+        public string? Key { get; set; }
+        public string? Issuer { get; set; }
+        public string? Audience { get; set; }
         public int ExpiresInMinutes { get; set; }
         public int RefreshTokenExpiresInDays { get; set; }
     }
diff --git a/Marco.Pms.Model/Dtos/Activities/CreateActivityMasterDto.cs b/Marco.Pms.Model/Dtos/Activities/CreateActivityMasterDto.cs
index 74913d7..4532ddb 100644
--- a/Marco.Pms.Model/Dtos/Activities/CreateActivityMasterDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/CreateActivityMasterDto.cs
@@ -1,10 +1,8 @@
-using System.ComponentModel;
-
-namespace Marco.Pms.Model.Dtos.Activities
+namespace Marco.Pms.Model.Dtos.Activities
 {
     public class CreateActivityMasterDto
     {
-        public string ActivityName { get; set; }
-        public string UnitOfMeasurement { get; set; }
+        public string? ActivityName { get; set; }
+        public string? UnitOfMeasurement { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs b/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
index 0fba54b..e31aedd 100644
--- a/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
@@ -5,7 +5,7 @@
         public long TaskAllocationId { get; set; }
 
         public DateTime CommentDate { get; set; }
-        public string Comment { get; set; }
+        public string? Comment { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
index 21882ec..067bad0 100644
--- a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
@@ -5,6 +5,6 @@
         public long Id { get; set; }
         public double CompletedTask { get; set; }
         public DateTime ReportedDate { get; set; }
-        public string Comment { get; set; }
+        public string? Comment { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Attendance/RecordAttendanceDot.cs b/Marco.Pms.Model/Dtos/Attendance/RecordAttendanceDot.cs
index 2cfac87..014f7f8 100644
--- a/Marco.Pms.Model/Dtos/Attendance/RecordAttendanceDot.cs
+++ b/Marco.Pms.Model/Dtos/Attendance/RecordAttendanceDot.cs
@@ -5,15 +5,15 @@ namespace Marco.Pms.Model.Dtos.Attendance
     public class RecordAttendanceDot
     {
         public int? Id { get; set; }
-        public string Comment { get; set; }
+        public string? Comment { get; set; }
         public int EmployeeID { get; set; }
         public int ProjectID { get; set; }
 
         public DateTime Date { get; set; }
 
         public string? MarkTime { get; set; }
-        public string Latitude { get; set; }
-        public string Longitude { get; set; }
+        public string? Latitude { get; set; }
+        public string? Longitude { get; set; }
 
 
         public ATTENDANCE_MARK_TYPE Action { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Employees/ApplicationUserDto.cs b/Marco.Pms.Model/Dtos/Employees/ApplicationUserDto.cs
index b6bdae8..c0665f7 100644
--- a/Marco.Pms.Model/Dtos/Employees/ApplicationUserDto.cs
+++ b/Marco.Pms.Model/Dtos/Employees/ApplicationUserDto.cs
@@ -16,7 +16,7 @@ namespace Marco.Pms.Model.Dtos.Employees
         public DateTime? BirthDate { get; set; }
         public DateTime? JoiningDate { get; set; }
 
-        public string PeramnentAddress { get; set; }
+        public string PermanentAddress { get; set; }
         public string CurrentAddress { get; set; }
         public string PhoneNumber { get; set; }
 
diff --git a/Marco.Pms.Model/Dtos/Employees/AttendanceDto.cs b/Marco.Pms.Model/Dtos/Employees/AttendanceDto.cs
index 1565527..069cd62 100644
--- a/Marco.Pms.Model/Dtos/Employees/AttendanceDto.cs
+++ b/Marco.Pms.Model/Dtos/Employees/AttendanceDto.cs
@@ -1,19 +1,8 @@
-using Marco.Pms.Model.Employees;
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos.Employees
+namespace Marco.Pms.Model.Dtos.Employees
 {
     public class AttendanceDto
     {
-        public string Comment { get; set; }
+        public string? Comment { get; set; }
         public int EmployeeID { get; set; }
         public DateTime? InTime { get; set; }
         public DateTime? OutTime { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs b/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs
index 023905e..da35cab 100644
--- a/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs
+++ b/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs
@@ -12,7 +12,7 @@
         public string? BirthDate { get; set; }
         public string? JoiningDate { get; set; }
 
-        public string? PeramnentAddress { get; set; }
+        public string? PermanentAddress { get; set; }
         public string? CurrentAddress { get; set; }  
         public string? PhoneNumber { get; set; }
 
diff --git a/Marco.Pms.Model/Dtos/ForgotPasswordDto.cs b/Marco.Pms.Model/Dtos/ForgotPasswordDto.cs
index a379ae7..518c1b5 100644
--- a/Marco.Pms.Model/Dtos/ForgotPasswordDto.cs
+++ b/Marco.Pms.Model/Dtos/ForgotPasswordDto.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
 namespace Marco.Pms.Model.Dtos
 {
@@ -11,6 +6,6 @@ namespace Marco.Pms.Model.Dtos
     {
         [Required]
         [EmailAddress]
-        public string Email { get; set; }
+        public string? Email { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/LoginDto.cs b/Marco.Pms.Model/Dtos/LoginDto.cs
index bf6f8cc..9fd0737 100644
--- a/Marco.Pms.Model/Dtos/LoginDto.cs
+++ b/Marco.Pms.Model/Dtos/LoginDto.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos
+namespace Marco.Pms.Model.Dtos
 {
     public class LoginDto
     {
-        public string Username { get; set; }
-        public string Password { get; set; }
+        public string? Username { get; set; }
+        public string? Password { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/LogoutDto.cs b/Marco.Pms.Model/Dtos/LogoutDto.cs
index 263424d..f2f1e0f 100644
--- a/Marco.Pms.Model/Dtos/LogoutDto.cs
+++ b/Marco.Pms.Model/Dtos/LogoutDto.cs
@@ -2,6 +2,6 @@
 namespace Marco.Pms.Model.Dtos
 {
     public class LogoutDto
-    {        public string RefreshToken { get; set; }
+    {        public string? RefreshToken { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Project/BuildingDot.cs b/Marco.Pms.Model/Dtos/Project/BuildingDot.cs
index 3fec06b..18756c7 100644
--- a/Marco.Pms.Model/Dtos/Project/BuildingDot.cs
+++ b/Marco.Pms.Model/Dtos/Project/BuildingDot.cs
@@ -1,13 +1,5 @@
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Marco.Pms.Model.Dtos.Project
 {
@@ -17,7 +9,7 @@ namespace Marco.Pms.Model.Dtos.Project
         public int Id { get; set; }
         [Required]
         [DisplayName("Building Name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
         public string? Description { get; set; }
         public int ProjectId { get; set; }
 
diff --git a/Marco.Pms.Model/Dtos/Project/BuildingVM.cs b/Marco.Pms.Model/Dtos/Project/BuildingVM.cs
index 8323564..b9a0bd9 100644
--- a/Marco.Pms.Model/Dtos/Project/BuildingVM.cs
+++ b/Marco.Pms.Model/Dtos/Project/BuildingVM.cs
@@ -5,10 +5,10 @@ namespace Marco.Pms.Model.Dtos.Project
     public class BuildingVM
     {
         public int Id { get; set; }      
-        public string Name { get; set; }
+        public string? Name { get; set; }
         public string? Description { get; set; }
 
-        public List<FloorsVM> Floors { get; set; }
+        public List<FloorsVM>? Floors { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Project/CreateProjectDto.cs b/Marco.Pms.Model/Dtos/Project/CreateProjectDto.cs
index 41e7f63..85abcee 100644
--- a/Marco.Pms.Model/Dtos/Project/CreateProjectDto.cs
+++ b/Marco.Pms.Model/Dtos/Project/CreateProjectDto.cs
@@ -8,15 +8,15 @@ namespace Marco.Pms.Model.Dtos.Project
         //public int Id { get; set; }
         [Required(ErrorMessage = "Project Name is required!")]
         [DisplayName("Project Name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [DisplayName("Project Address")]
         [Required(ErrorMessage = "Project Address is required!")]
-        public string ProjectAddress { get; set; }
+        public string? ProjectAddress { get; set; }
 
 
         [DisplayName("Contact Person")]
-        public string ContactPerson { get; set; }
+        public string? ContactPerson { get; set; }
 
 
         public DateTime? StartDate { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Project/FloorDot.cs b/Marco.Pms.Model/Dtos/Project/FloorDot.cs
index d437e78..c6f4885 100644
--- a/Marco.Pms.Model/Dtos/Project/FloorDot.cs
+++ b/Marco.Pms.Model/Dtos/Project/FloorDot.cs
@@ -1,14 +1,5 @@
-using Marco.Pms.Model.Entitlements;
-using Marco.Pms.Model.Projects;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Marco.Pms.Model.Dtos.Project
 {
@@ -18,7 +9,7 @@ namespace Marco.Pms.Model.Dtos.Project
 
         [Required]
         [DisplayName("Floor Name")]
-        public string FloorName { get; set; }
+        public string? FloorName { get; set; }
 
 
         public int BuildingId { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Project/FloorsVM.cs b/Marco.Pms.Model/Dtos/Project/FloorsVM.cs
index 7532493..05d936c 100644
--- a/Marco.Pms.Model/Dtos/Project/FloorsVM.cs
+++ b/Marco.Pms.Model/Dtos/Project/FloorsVM.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Marco.Pms.Model.Dtos.Project
 {
@@ -14,9 +9,9 @@ namespace Marco.Pms.Model.Dtos.Project
 
         [Required]
         [DisplayName("Floor Name")]
-        public string FloorName { get; set; }
+        public string? FloorName { get; set; }
 
-        public List<WorkAreaVM> WorkAreas { get; set; }
+        public List<WorkAreaVM>? WorkAreas { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Project/InfraDot.cs b/Marco.Pms.Model/Dtos/Project/InfraDot.cs
index a37fb6b..7c16c09 100644
--- a/Marco.Pms.Model/Dtos/Project/InfraDot.cs
+++ b/Marco.Pms.Model/Dtos/Project/InfraDot.cs
@@ -1,11 +1,4 @@
-using Marco.Pms.Model.Projects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos.Project
+namespace Marco.Pms.Model.Dtos.Project
 {
     public class InfraDot
     {
diff --git a/Marco.Pms.Model/Dtos/Project/ProjectDto.cs b/Marco.Pms.Model/Dtos/Project/ProjectDto.cs
index 8bdaaf3..3daa757 100644
--- a/Marco.Pms.Model/Dtos/Project/ProjectDto.cs
+++ b/Marco.Pms.Model/Dtos/Project/ProjectDto.cs
@@ -1,14 +1,5 @@
-using Marco.Pms.Model.Entitlements;
-using Marco.Pms.Model.Projects;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Marco.Pms.Model.Dtos.Project
 {
@@ -17,15 +8,15 @@ namespace Marco.Pms.Model.Dtos.Project
         public int Id { get; set; }
         [Required(ErrorMessage = "Project Name is required!")]
         [DisplayName("Project Name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [DisplayName("Project Address")]
         [Required(ErrorMessage = "Project Address is required!")]
-        public string ProjectAddress { get; set; }
+        public string? ProjectAddress { get; set; }
 
 
         [DisplayName("Contact Person")]
-        public string ContactPerson { get; set; }
+        public string? ContactPerson { get; set; }
 
 
         public DateTime? StartDate { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Project/ProjectVM.cs b/Marco.Pms.Model/Dtos/Project/ProjectVM.cs
index aef5d1f..6afc004 100644
--- a/Marco.Pms.Model/Dtos/Project/ProjectVM.cs
+++ b/Marco.Pms.Model/Dtos/Project/ProjectVM.cs
@@ -1,15 +1,8 @@
-using Marco.Pms.Model.Projects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos.Project
+namespace Marco.Pms.Model.Dtos.Project
 {
     public class ProjectVM : ProjectDto
     {
-        public List<BuildingVM> Buildings { get; set; }
+        public List<BuildingVM>? Buildings { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Project/UpdateProjectDto.cs b/Marco.Pms.Model/Dtos/Project/UpdateProjectDto.cs
index c155669..d3ac144 100644
--- a/Marco.Pms.Model/Dtos/Project/UpdateProjectDto.cs
+++ b/Marco.Pms.Model/Dtos/Project/UpdateProjectDto.cs
@@ -8,15 +8,15 @@ namespace Marco.Pms.Model.Dtos.Project
         public int Id { get; set; }
         [Required(ErrorMessage = "Project Name is required!")]
         [DisplayName("Project Name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [DisplayName("Project Address")]
         [Required(ErrorMessage = "Project Address is required!")]
-        public string ProjectAddress { get; set; }
+        public string? ProjectAddress { get; set; }
 
 
         [DisplayName("Contact Person")]
-        public string ContactPerson { get; set; }
+        public string? ContactPerson { get; set; }
 
 
         public DateTime? StartDate { get; set; }
diff --git a/Marco.Pms.Model/Dtos/Project/WorkAreaDot.cs b/Marco.Pms.Model/Dtos/Project/WorkAreaDot.cs
index c02ac52..8cf8d98 100644
--- a/Marco.Pms.Model/Dtos/Project/WorkAreaDot.cs
+++ b/Marco.Pms.Model/Dtos/Project/WorkAreaDot.cs
@@ -1,14 +1,5 @@
-using Marco.Pms.Model.Entitlements;
-using Marco.Pms.Model.Projects;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Marco.Pms.Model.Dtos.Project
 {
@@ -19,7 +10,7 @@ namespace Marco.Pms.Model.Dtos.Project
 
         [Required]
         [DisplayName("Area Name")]
-        public string AreaName { get; set; }
+        public string? AreaName { get; set; }
 
         public int FloorId { get; set; }
        
diff --git a/Marco.Pms.Model/Dtos/Project/WorkAreaVM.cs b/Marco.Pms.Model/Dtos/Project/WorkAreaVM.cs
index b40efe2..9fc27ba 100644
--- a/Marco.Pms.Model/Dtos/Project/WorkAreaVM.cs
+++ b/Marco.Pms.Model/Dtos/Project/WorkAreaVM.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Marco.Pms.Model.Dtos.Project
 {
@@ -14,9 +9,9 @@ namespace Marco.Pms.Model.Dtos.Project
 
         [Required]
         [DisplayName("Area Name")]
-        public string AreaName { get; set; }
+        public string? AreaName { get; set; }
 
-        public List<WorkItemVM> WorkItems { get; set; }
+        public List<WorkItemVM>? WorkItems { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Project/WorkItemVM.cs b/Marco.Pms.Model/Dtos/Project/WorkItemVM.cs
index 1396190..d62161a 100644
--- a/Marco.Pms.Model/Dtos/Project/WorkItemVM.cs
+++ b/Marco.Pms.Model/Dtos/Project/WorkItemVM.cs
@@ -5,6 +5,6 @@ namespace Marco.Pms.Model.Dtos.Project
     public class WorkItemVM
     {
         public int WorkItemId { get; set; }
-        public WorkItem WorkItem { get; set; }
+        public WorkItem? WorkItem { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/RefreshTokenDto.cs b/Marco.Pms.Model/Dtos/RefreshTokenDto.cs
index 7eaecc2..b6d5333 100644
--- a/Marco.Pms.Model/Dtos/RefreshTokenDto.cs
+++ b/Marco.Pms.Model/Dtos/RefreshTokenDto.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos
+namespace Marco.Pms.Model.Dtos
 {
     public class RefreshTokenDto
     {
-        public string Token { get; set; }
-        public string RefreshToken { get; set; }
+        public string? Token { get; set; }
+        public string? RefreshToken { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/RegisterDto.cs b/Marco.Pms.Model/Dtos/RegisterDto.cs
index 0f2c7ea..04e884f 100644
--- a/Marco.Pms.Model/Dtos/RegisterDto.cs
+++ b/Marco.Pms.Model/Dtos/RegisterDto.cs
@@ -1,26 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
 namespace Marco.Pms.Model.Dtos
 {
     public class RegisterDto
     {
         [Required]
-        public string Username { get; set; }
+        public string? Username { get; set; }
 
         [Required]
         [EmailAddress]
-        public string Email { get; set; }
+        public string? Email { get; set; }
 
         [Required]
         [MinLength(6)]
-        public string Password { get; set; }
+        public string? Password { get; set; }
 
         [Compare("Password", ErrorMessage = "Passwords do not match.")]
-        public string ConfirmPassword { get; set; }
+        public string? ConfirmPassword { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/ResetPasswordDto.cs b/Marco.Pms.Model/Dtos/ResetPasswordDto.cs
index 971da66..5ae11a5 100644
--- a/Marco.Pms.Model/Dtos/ResetPasswordDto.cs
+++ b/Marco.Pms.Model/Dtos/ResetPasswordDto.cs
@@ -6,13 +6,13 @@ namespace Marco.Pms.Model.Dtos
     {
         [Required]
         [EmailAddress]
-        public string Email { get; set; }
+        public string? Email { get; set; }
 
         [Required]
-        public string Token { get; set; }
+        public string? Token { get; set; }
 
         [Required]
         [MinLength(6)]
-        public string NewPassword { get; set; }
+        public string? NewPassword { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Roles/CreateApplicationRoleDto.cs b/Marco.Pms.Model/Dtos/Roles/CreateApplicationRoleDto.cs
index 6d72b65..a65f003 100644
--- a/Marco.Pms.Model/Dtos/Roles/CreateApplicationRoleDto.cs
+++ b/Marco.Pms.Model/Dtos/Roles/CreateApplicationRoleDto.cs
@@ -1,8 +1,5 @@
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Marco.Pms.Model.Dtos.Roles
 {
@@ -11,13 +8,13 @@ namespace Marco.Pms.Model.Dtos.Roles
         [Required(ErrorMessage = "Role Name is required!")]
         [DisplayName("Name")]
 
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
         [Required(ErrorMessage = "Role Description is required!")]
         [DisplayName("Description")]
 
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
-        public List<FeaturesPermissionDto> FeaturesPermission { get; set; } // Features assigned to this role
+        public List<FeaturesPermissionDto>? FeaturesPermission { get; set; } // Features assigned to this role
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Roles/CreateJobRoleDto.cs b/Marco.Pms.Model/Dtos/Roles/CreateJobRoleDto.cs
index ed6183d..d918264 100644
--- a/Marco.Pms.Model/Dtos/Roles/CreateJobRoleDto.cs
+++ b/Marco.Pms.Model/Dtos/Roles/CreateJobRoleDto.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos.Roles
+namespace Marco.Pms.Model.Dtos.Roles
 {
     public class CreateJobRoleDto
     {
-        public string Name { get; set; }
+        public string? Name { get; set; }
         public string? Description { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Roles/UpdateApplicationRoleDto.cs b/Marco.Pms.Model/Dtos/Roles/UpdateApplicationRoleDto.cs
index 938399b..b9c495b 100644
--- a/Marco.Pms.Model/Dtos/Roles/UpdateApplicationRoleDto.cs
+++ b/Marco.Pms.Model/Dtos/Roles/UpdateApplicationRoleDto.cs
@@ -1,5 +1,4 @@
-using Marco.Pms.Model.Entitlements;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Marco.Pms.Model.Dtos.Roles
@@ -11,15 +10,15 @@ namespace Marco.Pms.Model.Dtos.Roles
         [Required(ErrorMessage = "Role Name is required!")]
         [DisplayName("Name")]
 
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
         [Required(ErrorMessage = "Role Description is required!")]
         [DisplayName("Description")]
 
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
 
-        public List<FeaturesPermissionDto> FeaturesPermission { get; set; } // Features assigned to this role
+        public List<FeaturesPermissionDto>? FeaturesPermission { get; set; } // Features assigned to this role
     }
 
     public class FeaturesPermissionDto
diff --git a/Marco.Pms.Model/Dtos/Roles/UpdateJobRoleDto.cs b/Marco.Pms.Model/Dtos/Roles/UpdateJobRoleDto.cs
index ef017fe..e3d56af 100644
--- a/Marco.Pms.Model/Dtos/Roles/UpdateJobRoleDto.cs
+++ b/Marco.Pms.Model/Dtos/Roles/UpdateJobRoleDto.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Dtos.Roles
+namespace Marco.Pms.Model.Dtos.Roles
 {
     public class UpdateJobRoleDto
     {
         public int Id { get; set; }
-        public string Name { get; set; }
+        public string? Name { get; set; }
         public string? Description { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Util/EmailDot.cs b/Marco.Pms.Model/Dtos/Util/EmailDot.cs
index a09c921..f832101 100644
--- a/Marco.Pms.Model/Dtos/Util/EmailDot.cs
+++ b/Marco.Pms.Model/Dtos/Util/EmailDot.cs
@@ -2,10 +2,10 @@
 {
     public class EmailDot
     {
-        public string ToEmail { get; set; }
-        public string FromEmail { get; set; }
-        public string MailBody { get; set; }
-        public string MailSubject { get; set; }
+        public string? ToEmail { get; set; }
+        public string? FromEmail { get; set; }
+        public string? MailBody { get; set; }
+        public string? MailSubject { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Employees/EmployeeDetails.cs b/Marco.Pms.Model/Employees/EmployeeDetails.cs
index 5f9b505..183b07f 100644
--- a/Marco.Pms.Model/Employees/EmployeeDetails.cs
+++ b/Marco.Pms.Model/Employees/EmployeeDetails.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Employees
+namespace Marco.Pms.Model.Employees
 {
     public class EmployeeDetails : Employee
     {
diff --git a/Marco.Pms.Model/Employees/EmployeeDocument.cs b/Marco.Pms.Model/Employees/EmployeeDocument.cs
index 8092000..c9b7f92 100644
--- a/Marco.Pms.Model/Employees/EmployeeDocument.cs
+++ b/Marco.Pms.Model/Employees/EmployeeDocument.cs
@@ -6,16 +6,16 @@ namespace Marco.Pms.Model.Employees
     public class EmployeeDocument
     {
         public Guid Id { get; set; } // Unique identifier for the document
-        public string FileName { get; set; } // Original file name
-        public string FilePath { get; set; } // Path to the stored file
-        public string FileType { get; set; } // Type of the document (e.g., PDF, JPG)
+        public string? FileName { get; set; } // Original file name
+        public string? FilePath { get; set; } // Path to the stored file
+        public string? FileType { get; set; } // Type of the document (e.g., PDF, JPG)
         public long FileSize { get; set; } // File size in bytes
         public DateTime UploadedAt { get; set; } // Timestamp of upload
 
         public Guid EmployeeId { get; set; } // Foreign key to Employee
         [ValidateNever]
         [ForeignKey(nameof(EmployeeId))]
-        public Employee Employee { get; set; } // Navigation property to Employee
+        public Employee? Employee { get; set; } // Navigation property to Employee
     }
 
 
diff --git a/Marco.Pms.Model/Entitlements/EmployeeRoleMapping.cs b/Marco.Pms.Model/Entitlements/EmployeeRoleMapping.cs
index 5e92dc9..b3d1cf3 100644
--- a/Marco.Pms.Model/Entitlements/EmployeeRoleMapping.cs
+++ b/Marco.Pms.Model/Entitlements/EmployeeRoleMapping.cs
@@ -1,7 +1,6 @@
-using Marco.Pms.Model.Employees;
-using Microsoft.AspNetCore.Http;
+using System.ComponentModel.DataAnnotations.Schema;
+using Marco.Pms.Model.Employees;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Marco.Pms.Model.Entitlements
 {
diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index c951c00..7acd09c 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -2,8 +2,7 @@
 using Marco.Pms.Model.Dtos.Activities;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.ViewModels.Activities;
-using Microsoft.Extensions.DependencyModel;
-
+#nullable disable
 namespace Marco.Pms.Model.Mapper
 {
     public static class ActivitiesMapper
diff --git a/Marco.Pms.Model/Mapper/ApplicationRoleMapper.cs b/Marco.Pms.Model/Mapper/ApplicationRoleMapper.cs
index e2074ce..887f260 100644
--- a/Marco.Pms.Model/Mapper/ApplicationRoleMapper.cs
+++ b/Marco.Pms.Model/Mapper/ApplicationRoleMapper.cs
@@ -1,7 +1,7 @@
 using Marco.Pms.Model.Dtos.Roles;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.ViewModels;
-
+#nullable disable
 namespace Marco.Pms.Model.Mapper
 {
     public static class ApplicationRoleMapper
diff --git a/Marco.Pms.Model/Mapper/EmployeeMapper.cs b/Marco.Pms.Model/Mapper/EmployeeMapper.cs
index 9290662..fdef0dd 100644
--- a/Marco.Pms.Model/Mapper/EmployeeMapper.cs
+++ b/Marco.Pms.Model/Mapper/EmployeeMapper.cs
@@ -24,7 +24,7 @@ namespace Marco.Pms.Model.Mapper
                 JobRole = (model.JobRole != null ? model.JobRole.Name : null),
                 JobRoleId = model.JobRoleId,
                 PanNumber = model.PanNumber,
-                PeramnentAddress = model.PeramnentAddress,
+                PermanentAddress = model.PeramnentAddress,
                 PhoneNumber = model.PhoneNumber,
                 Photo = model.Photo,
                 IsActive = model.IsActive,
diff --git a/Marco.Pms.Model/Mapper/EmployeeRoleMapper.cs b/Marco.Pms.Model/Mapper/EmployeeRoleMapper.cs
index f4ba30f..fa442d3 100644
--- a/Marco.Pms.Model/Mapper/EmployeeRoleMapper.cs
+++ b/Marco.Pms.Model/Mapper/EmployeeRoleMapper.cs
@@ -1,7 +1,5 @@
 using Marco.Pms.Model.Dtos.Employees;
-using Marco.Pms.Model.Dtos.Roles;
 using Marco.Pms.Model.Entitlements;
-using Marco.Pms.Model.ViewModels;
 
 namespace Marco.Pms.Model.Mapper
 {
diff --git a/Marco.Pms.Model/Mapper/FeatureMapper.cs b/Marco.Pms.Model/Mapper/FeatureMapper.cs
index 9fc3c1f..681afb6 100644
--- a/Marco.Pms.Model/Mapper/FeatureMapper.cs
+++ b/Marco.Pms.Model/Mapper/FeatureMapper.cs
@@ -1,5 +1,4 @@
-using Marco.Pms.Model.Dtos.Roles;
-using Marco.Pms.Model.Entitlements;
+using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.ViewModels;
 
 namespace Marco.Pms.Model.Mapper
diff --git a/Marco.Pms.Model/Mapper/InfraMapper.cs b/Marco.Pms.Model/Mapper/InfraMapper.cs
index 07e7e00..ca76047 100644
--- a/Marco.Pms.Model/Mapper/InfraMapper.cs
+++ b/Marco.Pms.Model/Mapper/InfraMapper.cs
@@ -1,6 +1,5 @@
 using Marco.Pms.Model.Dtos.Project;
 using Marco.Pms.Model.Projects;
-using Marco.Pms.Model.ViewModels.Activities;
 
 namespace Marco.Pms.Model.Mapper
 {
diff --git a/Marco.Pms.Model/Projects/PhotoGallary.cs b/Marco.Pms.Model/Projects/PhotoGallary.cs
index 97f44f7..4c2a75f 100644
--- a/Marco.Pms.Model/Projects/PhotoGallary.cs
+++ b/Marco.Pms.Model/Projects/PhotoGallary.cs
@@ -7,12 +7,12 @@ namespace Marco.Pms.Model.Projects
     public class PhotoGallary
     {
         public int Id { get; set; }
-        public string Description { get; set; }
+        public string? Description { get; set; }
         public int ProjectId { get; set; }
         [ValidateNever]
         [ForeignKey(nameof(ProjectId))]
         public Project? Project { get; set; }
-        public string AddedBy { get; set; }
+        public string? AddedBy { get; set; }
         [ValidateNever]
         [ForeignKey(nameof(AddedBy))]
         public ApplicationUser?  ApplicationUser { get; set; }
diff --git a/Marco.Pms.Model/Projects/Project.cs b/Marco.Pms.Model/Projects/Project.cs
index d040b6c..58095c8 100644
--- a/Marco.Pms.Model/Projects/Project.cs
+++ b/Marco.Pms.Model/Projects/Project.cs
@@ -1,14 +1,8 @@
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Marco.Pms.Model.Entitlements;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 
 namespace Marco.Pms.Model.Projects
 {
diff --git a/Marco.Pms.Model/Projects/WorkArea.cs b/Marco.Pms.Model/Projects/WorkArea.cs
index d9a1774..f2a15bf 100644
--- a/Marco.Pms.Model/Projects/WorkArea.cs
+++ b/Marco.Pms.Model/Projects/WorkArea.cs
@@ -1,14 +1,8 @@
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations.Schema;
 using Marco.Pms.Model.Entitlements;
-using Marco.Pms.Model.Activities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 
 namespace Marco.Pms.Model.Projects
 {
diff --git a/Marco.Pms.Model/Projects/WorkItemMapping.cs b/Marco.Pms.Model/Projects/WorkItemMapping.cs
index 81a665f..a974e91 100644
--- a/Marco.Pms.Model/Projects/WorkItemMapping.cs
+++ b/Marco.Pms.Model/Projects/WorkItemMapping.cs
@@ -11,18 +11,18 @@ namespace Marco.Pms.Model.Projects
         public int WorkAreaId { get; set; }
         [ForeignKey("WorkAreaId")]
         [ValidateNever]
-        public WorkArea WorkArea { get; set; }
+        public WorkArea? WorkArea { get; set; }
         public int WorkItemId { get; set; }
         [ForeignKey("WorkItemId")]
         [ValidateNever]
-        public WorkItem WorkItem { get; set; }
+        public WorkItem? WorkItem { get; set; }
 
         [DisplayName("TenantId")]
         public int TenantId { get; set; }
 
         [ValidateNever]
         [ForeignKey(nameof(TenantId))]
-        public Tenant Tenant { get; set; }
+        public Tenant? Tenant { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Providers/TenantProvider.cs b/Marco.Pms.Model/Providers/TenantProvider.cs
index 9e182d8..9190f87 100644
--- a/Marco.Pms.Model/Providers/TenantProvider.cs
+++ b/Marco.Pms.Model/Providers/TenantProvider.cs
@@ -1,10 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+#nullable disable
 namespace Marco.Pms.Model.Providers
 {
     public sealed class TenantProvider
diff --git a/Marco.Pms.Model/Utilities/ApiResponse.cs b/Marco.Pms.Model/Utilities/ApiResponse.cs
index 269f1bd..a1b4cb8 100644
--- a/Marco.Pms.Model/Utilities/ApiResponse.cs
+++ b/Marco.Pms.Model/Utilities/ApiResponse.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+#nullable disable
 namespace Marco.Pms.Model.Utilities
 {
  
diff --git a/Marco.Pms.Model/Utilities/AuthResponse.cs b/Marco.Pms.Model/Utilities/AuthResponse.cs
index bfeed3b..d9701f8 100644
--- a/Marco.Pms.Model/Utilities/AuthResponse.cs
+++ b/Marco.Pms.Model/Utilities/AuthResponse.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Utilities
+namespace Marco.Pms.Model.Utilities
 {
     public class AuthResponse
     {
-        public string AccessToken { get; set; }
-        public string RefreshToken { get; set; }
+        public string? AccessToken { get; set; }
+        public string? RefreshToken { get; set; }
         public int ExpiresIn { get; set; }
-        public object User { get; set; }
+        public object? User { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Utilities/FileDetails.cs b/Marco.Pms.Model/Utilities/FileDetails.cs
index 2542a1d..46665cd 100644
--- a/Marco.Pms.Model/Utilities/FileDetails.cs
+++ b/Marco.Pms.Model/Utilities/FileDetails.cs
@@ -9,13 +9,13 @@ namespace Marco.Pms.Model.Utilities
     public class FileDetails
     {
         public int Id { get; set; }
-        public byte[] FileData { get; set; } // Byte array for the file
-        public string FileName { get; set; }
-        public string ContentType { get; set; }
+        public byte[]? FileData { get; set; } // Byte array for the file
+        public string? FileName { get; set; }
+        public string? ContentType { get; set; }
         /// <summary>
         /// Name of the file as stored on disk
         /// </summary>
-        public string StoredName { get; set; }
+        public string? StoredName { get; set; }
 
     }
 }
diff --git a/Marco.Pms.Model/Utilities/FileUploadModel.cs b/Marco.Pms.Model/Utilities/FileUploadModel.cs
index b6d4ff6..93ecb2c 100644
--- a/Marco.Pms.Model/Utilities/FileUploadModel.cs
+++ b/Marco.Pms.Model/Utilities/FileUploadModel.cs
@@ -1,17 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.Utilities
+namespace Marco.Pms.Model.Utilities
 {
     public class FileUploadModel
     {
-        public string FileName { get; set; }          // Name of the file (e.g., "image1.png")
-        public string Base64Data { get; set; }       // Base64-encoded string of the file
-        public string ContentType { get; set; }      // MIME type (e.g., "image/png", "application/pdf")
+        public string? FileName { get; set; }          // Name of the file (e.g., "image1.png")
+        public string? Base64Data { get; set; }       // Base64-encoded string of the file
+        public string? ContentType { get; set; }      // MIME type (e.g., "image/png", "application/pdf")
         public long FileSize { get; set; }           // File size in bytes
-        public string Description { get; set; }      // Optional: Description or purpose of the file
+        public string? Description { get; set; }      // Optional: Description or purpose of the file
     }
 }
diff --git a/Marco.Pms.Model/Utilities/SmtpSettings.cs b/Marco.Pms.Model/Utilities/SmtpSettings.cs
index ed64642..28e16f5 100644
--- a/Marco.Pms.Model/Utilities/SmtpSettings.cs
+++ b/Marco.Pms.Model/Utilities/SmtpSettings.cs
@@ -2,11 +2,11 @@
 {
     public class SmtpSettings
     {
-        public string SmtpServer { get; set; }
+        public string? SmtpServer { get; set; }
         public int Port { get; set; }
-        public string SenderName { get; set; }
-        public string SenderEmail { get; set; }
-        public string Password { get; set; }
+        public string? SenderName { get; set; }
+        public string? SenderEmail { get; set; }
+        public string? Password { get; set; }
     }
 
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs b/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
index de99612..889180e 100644
--- a/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
@@ -7,7 +7,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public long Id { get; set; }
         public long TaskAllocationId { get; set; }
         public DateTime CommentDate { get; set; }
-        public string Comment { get; set; }
+        public string? Comment { get; set; }
         public int CommentedBy { get; set; }
         public EmployeeVM? Employee { get; set; }
     }
diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index d563138..b8d42c1 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -13,7 +13,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public int WorkItemId { get; set; }
         public WorkItem? WorkItem { get; set; }
         public int TenantId { get; set; }
-        public List<EmployeeVM> teamMembers { get; set; }
+        public List<EmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TasksVM.cs b/Marco.Pms.Model/ViewModels/Activities/TasksVM.cs
index 00ef6e9..3b7d3ab 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TasksVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TasksVM.cs
@@ -3,7 +3,7 @@
     public class TasksVM
     {
         public long Id { get; set; }
-        public string ActivityName { get; set; }
+        public string? ActivityName { get; set; }
         public double TotalPlannedTask { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
diff --git a/Marco.Pms.Model/ViewModels/ApplicationRolesVM.cs b/Marco.Pms.Model/ViewModels/ApplicationRolesVM.cs
index 9fc0e4b..84fd29c 100644
--- a/Marco.Pms.Model/ViewModels/ApplicationRolesVM.cs
+++ b/Marco.Pms.Model/ViewModels/ApplicationRolesVM.cs
@@ -1,20 +1,10 @@
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.ViewModels
+namespace Marco.Pms.Model.ViewModels
 {
     public class ApplicationRolesVM
     {
         public Guid Id { get; set; }
-        public string Role { get; set; }
-        public string Description { get; set; }
-        public ICollection<FeaturePermissionVM> FeaturePermission { get; set; }
+        public string? Role { get; set; }
+        public string? Description { get; set; }
+        public ICollection<FeaturePermissionVM>? FeaturePermission { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs b/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs
index 54966b5..cad12f3 100644
--- a/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs
+++ b/Marco.Pms.Model/ViewModels/Employee/EmployeeProfile.cs
@@ -2,9 +2,9 @@
 {
     public class EmployeeProfile
     {
-        public EmployeeVM EmployeeInfo { get; set; }
-        public string[] Projects { get; set; }
-        public string[] FeaturePermissions { get; set; } 
-        public string[] Features { get; set; }
+        public EmployeeVM? EmployeeInfo { get; set; }
+        public string[]? Projects { get; set; }
+        public string[]? FeaturePermissions { get; set; } 
+        public string[]? Features { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs b/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs
index b17a3c7..4ca84c0 100644
--- a/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs
+++ b/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs
@@ -11,7 +11,7 @@
         public string? Gender { get; set; }
         public DateTime? BirthDate { get; set; } 
         public DateTime? JoiningDate { get; set; }
-        public string? PeramnentAddress { get; set; }
+        public string? PermanentAddress { get; set; }
         public string? CurrentAddress { get; set; }
         public string? PhoneNumber { get; set; }
 
diff --git a/Marco.Pms.Model/ViewModels/EmployeeRolesVM.cs b/Marco.Pms.Model/ViewModels/EmployeeRolesVM.cs
index a7b6c80..9362944 100644
--- a/Marco.Pms.Model/ViewModels/EmployeeRolesVM.cs
+++ b/Marco.Pms.Model/ViewModels/EmployeeRolesVM.cs
@@ -1,15 +1,12 @@
-using Marco.Pms.Model.Employees;
-using Marco.Pms.Model.Entitlements;
-
-namespace Marco.Pms.Model.ViewModels
+namespace Marco.Pms.Model.ViewModels
 {
     public class EmployeeRolesVM
     {
         public Guid Id { get; set; }
         public int EmployeeId { get; set; }
         public Guid RoleId { get; set; }
-        public string Name { get; set; }
-        public string Description { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
         public bool IsEnabled { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/FeaturePermissionVM.cs b/Marco.Pms.Model/ViewModels/FeaturePermissionVM.cs
index 27a78dd..f3336d5 100644
--- a/Marco.Pms.Model/ViewModels/FeaturePermissionVM.cs
+++ b/Marco.Pms.Model/ViewModels/FeaturePermissionVM.cs
@@ -1,13 +1,4 @@
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.ViewModels
+namespace Marco.Pms.Model.ViewModels
 {
     public class FeaturePermissionVM
     {
@@ -16,8 +7,8 @@ namespace Marco.Pms.Model.ViewModels
 
         public Guid FeatureId { get; set; } // Foreign key to Feature
 
-        public string Name { get; set; } // Feature name
-        public string Description { get; set; } // Feature description
+        public string? Name { get; set; } // Feature name
+        public string? Description { get; set; } // Feature description
 
         public bool IsEnabled { get; set; } // Whether the feature is enabled for this role
        
diff --git a/Marco.Pms.Model/ViewModels/FeatureVM.cs b/Marco.Pms.Model/ViewModels/FeatureVM.cs
index ef1e754..0f14530 100644
--- a/Marco.Pms.Model/ViewModels/FeatureVM.cs
+++ b/Marco.Pms.Model/ViewModels/FeatureVM.cs
@@ -1,26 +1,17 @@
-using Marco.Pms.Model.Entitlements;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Model.ViewModels
+namespace Marco.Pms.Model.ViewModels
 {
     public class FeatureVM
     {
         public Guid Id { get; set; } // Unique identifier for the permission
 
-        public string Name { get; set; } // Feature name
-        public string Description { get; set; } // Feature description
+        public string? Name { get; set; } // Feature name
+        public string? Description { get; set; } // Feature description
         public bool IsActive { get; set; }
         public int? ModuleId { get; set; }
 
         public string? ModuleName { get; set; }
         public string? ModuleKey { get; set; }
 
-        public ICollection<FeaturePermissionVM> FeaturePermissions { get; set; }
+        public ICollection<FeaturePermissionVM>? FeaturePermissions { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/InfraVM.cs b/Marco.Pms.Model/ViewModels/InfraVM.cs
index 64d65ce..9bdea2b 100644
--- a/Marco.Pms.Model/ViewModels/InfraVM.cs
+++ b/Marco.Pms.Model/ViewModels/InfraVM.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Marco.Pms.Model.Projects;
+using Marco.Pms.Model.Projects;
 
 namespace Marco.Pms.Model.ViewModels
 {
@@ -12,6 +7,6 @@ namespace Marco.Pms.Model.ViewModels
         public Building? building { get; set; }
         public Floor? floor { get; set; }
 
-        public WorkArea workArea { get; set; }
+        public WorkArea? workArea { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/JobRoleVM.cs b/Marco.Pms.Model/ViewModels/JobRoleVM.cs
index 8c5e3d5..06a817b 100644
--- a/Marco.Pms.Model/ViewModels/JobRoleVM.cs
+++ b/Marco.Pms.Model/ViewModels/JobRoleVM.cs
@@ -3,8 +3,8 @@
     public class JobRoleVM
     {
 
-            public int Id { get; set; }
-            public string Name { get; set; }
+            public int? Id { get; set; }
+            public string? Name { get; set; }
             public string? Description { get; set; }
        
     }
diff --git a/Marco.Pms.Model/ViewModels/ProjectDetailsVM.cs b/Marco.Pms.Model/ViewModels/ProjectDetailsVM.cs
index 5ef1d64..9726bf2 100644
--- a/Marco.Pms.Model/ViewModels/ProjectDetailsVM.cs
+++ b/Marco.Pms.Model/ViewModels/ProjectDetailsVM.cs
@@ -6,14 +6,14 @@ namespace Marco.Pms.Model.ViewModels
 {
     public class ProjectDetailsVM
     {
-        public Project project { get; set; }
-        public List<TaskAllocation> employeeAllocation { get; set; }
-        public List<EmployeeDetails> employees { get; set; }
+        public Project? project { get; set; }
+        public List<TaskAllocation>? employeeAllocation { get; set; }
+        public List<EmployeeDetails>? employees { get; set; }
 
-        public List<Building> buildings { get; set; }
-        public List<Floor> floors { get; set; }
+        public List<Building>? buildings { get; set; }
+        public List<Floor>? floors { get; set; }
 
-        public List<WorkArea> workAreas { get; set; }
-        public List<WorkItem> workItems { get; set; }
+        public List<WorkArea>? workAreas { get; set; }
+        public List<WorkItem>? workItems { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/RolesVM.cs b/Marco.Pms.Model/ViewModels/RolesVM.cs
index 1a8d606..ac3501b 100644
--- a/Marco.Pms.Model/ViewModels/RolesVM.cs
+++ b/Marco.Pms.Model/ViewModels/RolesVM.cs
@@ -1,13 +1,11 @@
-using Marco.Pms.Model.Entitlements;
-
-namespace Marco.Pms.Model.ViewModels
+namespace Marco.Pms.Model.ViewModels
 {
 
     public class RolesVM
     {
         public Guid Id { get; set; }
-        public string Role { get; set; }
+        public string? Role { get; set; }
 
-        public ICollection<FeaturePermissionVM> FeaturePermissions { get; set; } 
+        public ICollection<FeaturePermissionVM>? FeaturePermissions { get; set; } 
     }
 }
diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs
index 4e38b40..b772e75 100644
--- a/Marco.Pms.Services/Controllers/EmployeeController.cs
+++ b/Marco.Pms.Services/Controllers/EmployeeController.cs
@@ -294,7 +294,7 @@ namespace MarcoBMS.Services.Controllers
                 Gender = model.Gender,
                 MiddleName = model.MiddleName,
                 PanNumber = model.PanNumber,
-                PeramnentAddress = model.PeramnentAddress,
+                PeramnentAddress = model.PermanentAddress,
                 PhoneNumber = model.PhoneNumber,
                 Photo = null, // GetFileDetails(model.Photo).Result.FileData,
                 JobRoleId = Convert.ToInt32(model.JobRoleId),
@@ -321,7 +321,7 @@ namespace MarcoBMS.Services.Controllers
             existingEmployee.Gender = model.Gender;
             existingEmployee.MiddleName = model.MiddleName;
             existingEmployee.PanNumber = model.PanNumber;
-            existingEmployee.PeramnentAddress = model.PeramnentAddress;
+            existingEmployee.PeramnentAddress = model.PermanentAddress;
             existingEmployee.PhoneNumber = model.PhoneNumber;
             existingEmployee.Photo = null; // GetFileDetails(model.Photo).Result.FileData,
             existingEmployee.JobRoleId = Convert.ToInt32(model.JobRoleId);
diff --git a/Marco.Pms.Utility/SessionUtil.cs b/Marco.Pms.Utility/SessionUtil.cs
index 5083419..8177903 100644
--- a/Marco.Pms.Utility/SessionUtil.cs
+++ b/Marco.Pms.Utility/SessionUtil.cs
@@ -1,12 +1,4 @@
-using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Marco.Pms.Utility
+namespace Marco.Pms.Utility
 {
     public class SessionUtil
     {