diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
index bb4003c..9e03bcb 100644
--- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
+++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
@@ -73,6 +73,7 @@ namespace Marco.Pms.DataAccess.Data
 
         public DbSet<Industry>Industries { get; set; }
         public DbSet<ActivityCheckList>ActivityCheckLists { get; set; }
+        public DbSet<CheckListMappings> CheckListMappings { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
diff --git a/Marco.Pms.DataAccess/Migrations/20250415111241_Added_CheckListMappings_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250415111241_Added_CheckListMappings_Table.Designer.cs
new file mode 100644
index 0000000..b2221b8
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250415111241_Added_CheckListMappings_Table.Designer.cs
@@ -0,0 +1,2092 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250415111241_Added_CheckListMappings_Table")]
+    partial class Added_CheckListMappings_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<int>("AssignedBy")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkItemId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("CommentedBy")
+                        .HasColumnType("int");
+
+                    b.Property<long>("TaskAllocationId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<int>("EmployeeId")
+                        .HasColumnType("int");
+
+                    b.Property<long>("TaskAllocationId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ApprovedBy")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("EmployeeID")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("ProjectID")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("AttendanceId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("EmployeeID")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("UpdatedBy")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("JobRoleId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ActivityMasterId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Check")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityMaster", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            ActivityName = "Core Cutting",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Number"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            ActivityName = "Fabrication",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            ActivityName = "Lifting",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            ActivityName = "Hanging",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            ActivityName = "Tapping",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            ActivityName = "Welding",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            ActivityName = "Testing",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Area"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            ActivityName = "Painting",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            ActivityName = "Marking Area",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Meter"
+                        },
+                        new
+                        {
+                            Id = 10,
+                            ActivityName = "Drilling",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Number"
+                        },
+                        new
+                        {
+                            Id = 11,
+                            ActivityName = "MS Support Fabrication",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Number"
+                        },
+                        new
+                        {
+                            Id = 12,
+                            ActivityName = "MS Support Hanging",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Number"
+                        },
+                        new
+                        {
+                            Id = 13,
+                            ActivityName = "Hydrant Volve",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Number"
+                        },
+                        new
+                        {
+                            Id = 14,
+                            ActivityName = "Sprinkler Installation",
+                            IsActive = true,
+                            TenantId = 1,
+                            UnitOfMeasurement = "Number"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("2c8d0808-c421-11ef-9b93-0242ac110002"),
+                            Description = "",
+                            Role = "Admin",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("62e0918d-c421-11ef-9b93-0242ac110002"),
+                            Description = "",
+                            Role = "Welder",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("68823f1f-c421-11ef-9b93-0242ac110002"),
+                            Description = "",
+                            Role = "Helper",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("6d3a7c72-c421-11ef-9b93-0242ac110002"),
+                            Description = "",
+                            Role = "Site Engineer",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("6d3aad72-c421-11ef-9b93-0242ac110002"),
+                            Description = "",
+                            Role = "Project Manager",
+                            TenantId = 1
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CheckListId")
+                        .HasColumnType("int");
+
+                    b.Property<long>("TaskAllocationId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("EmployeeId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("ModuleId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = 1,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = 1,
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = 1,
+                            Name = "Manage Tasks"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Assign and Update Tasks Progress",
+                            IsActive = true,
+                            ModuleId = 1,
+                            Name = "Assign and Update Tasks Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = 2,
+                            Name = "Manage Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = 2,
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = 3,
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("660131a4-788c-4739-a082-cbbf7879cbf2"),
+                            Description = "Tenant Masters",
+                            IsActive = true,
+                            ModuleId = 3,
+                            Name = "Tenant Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Manage Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("d135a4b0-4f9a-4903-ab9c-4843839ebdee"),
+                            Description = "",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Assign Task and Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("ed99ecd4-1bed-42e1-b7b3-d64c04493823"),
+                            Description = "",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Manage Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign To Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Perform Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("cb8ec407-46d4-4467-930c-69127cda6dec"),
+                            Description = "",
+                            FeatureId = new Guid("660131a4-788c-4739-a082-cbbf7879cbf2"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("6b1a6d97-a951-4de5-9b19-709bac7c4f18"),
+                            Description = "",
+                            FeatureId = new Guid("660131a4-788c-4739-a082-cbbf7879cbf2"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.JobRole", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Module", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.StatusMaster", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Status = "Active",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Status = "In Progress",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Status = "On Hold",
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Status = "Completed",
+                            TenantId = 1
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("IndustryId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = 1,
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Industries.Industry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = 7,
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = 8,
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = 9,
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ProjectId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BuildingId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ProjectStatusId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            ContactPerson = "Project 1 Contact Person",
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = 1,
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = 2,
+                            ContactPerson = "Project 2 Contact Person",
+                            Name = "Project 2",
+                            ProjectAddress = "Project 2 Address",
+                            ProjectStatusId = 2,
+                            TenantId = 1
+                        },
+                        new
+                        {
+                            Id = 3,
+                            ContactPerson = "Project 3 Contact Person",
+                            Name = "Project 3",
+                            ProjectAddress = "Project 3 Address",
+                            ProjectStatusId = 3,
+                            TenantId = 1
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("EmployeeId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("JobRoleId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ProjectId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("FloorId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ActivityId")
+                        .HasColumnType("int");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkAreaId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("TenantId")
+                        .HasColumnType("int");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Industries.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.Project", "Project")
+                        .WithMany()
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250415111241_Added_CheckListMappings_Table.cs b/Marco.Pms.DataAccess/Migrations/20250415111241_Added_CheckListMappings_Table.cs
new file mode 100644
index 0000000..9a55d5a
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250415111241_Added_CheckListMappings_Table.cs
@@ -0,0 +1,37 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_CheckListMappings_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CheckListMappings",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    TaskAllocationId = table.Column<long>(type: "bigint", nullable: false),
+                    CheckListId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckListMappings", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CheckListMappings");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index b2a0cc8..0537e83 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -604,6 +604,25 @@ namespace Marco.Pms.DataAccess.Migrations
                         });
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CheckListId")
+                        .HasColumnType("int");
+
+                    b.Property<long>("TaskAllocationId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Entitlements.EmployeeRoleMapping", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/Marco.Pms.Model/Entitlements/CheckListMappings.cs b/Marco.Pms.Model/Entitlements/CheckListMappings.cs
new file mode 100644
index 0000000..6aa2631
--- /dev/null
+++ b/Marco.Pms.Model/Entitlements/CheckListMappings.cs
@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Entitlements
+{
+    public class CheckListMappings
+    {
+        public int Id { get; set; }
+        public long TaskAllocationId { get; set; }
+        public int CheckListId { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index 9cb1592..6ad207b 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -133,14 +133,14 @@ namespace Marco.Pms.Model.Mapper
                 CheckLists = checkList,
             };
         }
-        public static CheckListVM ToCheckListVMFromActivityCheckList(this ActivityCheckList checkList,int activityId)
+        public static CheckListVM ToCheckListVMFromActivityCheckList(this ActivityCheckList checkList,int activityId,bool IsChecked)
         {
             return new CheckListVM
             {
                 Id = checkList.Id,
                 Check = checkList.Check,
                 ActivityMasterId = activityId,
-                IsChecked = checkList.IsChecked,
+                IsChecked = IsChecked,
                 IsMandatory = checkList.IsMandatory,
             };
         }
@@ -155,5 +155,16 @@ namespace Marco.Pms.Model.Mapper
                 TenantId = tenantId
             };
         }
+        public static CheckListVM ToCheckListVMFromReportCheckListDto(this ReportCheckListDto checkListDto, int activityId)
+        {
+            return new CheckListVM
+            {
+                Id = checkListDto.Id,
+                Check = checkListDto.Check,
+                ActivityMasterId = activityId,
+                IsChecked = checkListDto.IsChecked,
+                IsMandatory = checkListDto.IsMandatory,
+            };
+        }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
index 91a324d..71e6831 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
@@ -15,5 +15,6 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public int TenantId { get; set; }
 
         public List<CommentVM>? Comments { get; set; }
+        public List<CheckListVM>? checkList { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index b1110f8..5eb3d9c 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -37,7 +37,7 @@ namespace Marco.Pms.Services.Controllers
                 {
                     foreach (ActivityCheckList check in checkList)
                     {
-                        var checkVM = check.ToCheckListVMFromActivityCheckList(activity.Id);
+                        var checkVM = check.ToCheckListVMFromActivityCheckList(activity.Id,false);
                         checkListVM.Add(checkVM);
                     }
                 }
@@ -73,7 +73,7 @@ namespace Marco.Pms.Services.Controllers
                 List<CheckListVM> checkListVM = new List<CheckListVM>();
                 foreach (ActivityCheckList check in activityCheckList)
                 {
-                    var checkVM = check.ToCheckListVMFromActivityCheckList(activityMaster.Id);
+                    var checkVM = check.ToCheckListVMFromActivityCheckList(activityMaster.Id,false);
                     checkListVM.Add(checkVM);
                 }
 
@@ -107,7 +107,7 @@ namespace Marco.Pms.Services.Controllers
                     List<CheckListVM> checkListVM = new List<CheckListVM>();
                     foreach (ActivityCheckList check in activityCheckList)
                     {
-                        var checkVM = check.ToCheckListVMFromActivityCheckList(activity.Id);
+                        var checkVM = check.ToCheckListVMFromActivityCheckList(activity.Id, false);
                         checkListVM.Add(checkVM);
                     }
 
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 08431d0..56bcef4 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -116,14 +116,26 @@ namespace MarcoBMS.Services.Controllers
                 taskAllocation.CompletedTask = reportTask.CompletedTask;
                 taskAllocation.WorkItem.CompletedWork += reportTask.CompletedTask;
             }
-            List<ActivityCheckList> activityCheckLists = new List<ActivityCheckList>();
+            List<CheckListMappings> checkListMappings = new List<CheckListMappings>();
+            List<CheckListVM> checkListVMs = new List<CheckListVM>();
             foreach (var checkDto in reportTask.CheckList)
             {
-                var check = checkList.Find(c => c.Id == checkDto.Id);
-                check.IsChecked = checkDto.IsChecked;
-                activityCheckLists.Add(check);
+                checkListVMs.Add(checkDto.ToCheckListVMFromReportCheckListDto(taskAllocation.WorkItem.ActivityId));
+                if (checkDto.IsChecked)
+                {
+                    var check = checkList.Find(c => c.Id == checkDto.Id);
+                    if (check != null)
+                    {
+                        CheckListMappings checkListMapping = new CheckListMappings
+                        {
+                            CheckListId = check.Id,
+                            TaskAllocationId = reportTask.Id
+                        };
+                        checkListMappings.Add(checkListMapping);
+                    }
+                }
             }
-            _context.ActivityCheckLists.UpdateRange(activityCheckLists);
+            _context.CheckListMappings.AddRange(checkListMappings);
             var comment = reportTask.ToCommentFromReportTaskDto(tenantId,Employee.Id);
 
             _context.TaskComments.Add(comment);
@@ -137,6 +149,7 @@ namespace MarcoBMS.Services.Controllers
                 resultComments.Add(result.ToCommentVMFromTaskComment());
             }
             response.Comments = resultComments;
+            response.checkList = checkListVMs;
             return Ok(ApiResponse<object>.SuccessResponse(response, "Task reported successfully", 200));
         }
 
@@ -223,9 +236,18 @@ namespace MarcoBMS.Services.Controllers
                         commentVM.Add(comment.ToCommentVMFromTaskComment());
                     }
                     List<ActivityCheckList> checkLists = await _context.ActivityCheckLists.Where(x => x.ActivityMasterId == taskAllocation.WorkItem.ActivityId).ToListAsync();
+                    List<CheckListMappings> checkListMappings = await _context.CheckListMappings.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
                     List<CheckListVM>checkList = new List<CheckListVM>();
                     foreach (var check in checkLists) {
-                        checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityMasterId));
+                    var checkListMapping = checkListMappings.Find(c => c.CheckListId == check.Id);
+                        if(checkListMapping != null)
+                        {
+                            checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityMasterId, true));
+                        }
+                        else
+                        {
+                            checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityMasterId, false));
+                        }
                     }
                     response.comments = commentVM;
                     response.teamMembers = team;