From 5037ba24caf595a46363b85b2975f6259d3544dc Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Fri, 3 Jul 2026 13:14:55 -0700
Subject: [PATCH 1/9] feature/AB#32580-TemplateAttachments

---
 .../Emails/IEmailLogAttachmentAppService.cs   |    1 +
 .../IEmailLogAttachmentUploadService.cs       |    4 +-
 .../Emails/EmailAttachmentService.cs          |   32 +-
 .../Emails/EmailLogAttachmentAppService.cs    |   49 +-
 .../Events/EmailNotificationHandler.cs        |    1 +
 .../Templates/ITemplatesService.cs            |    2 +-
 .../Templates/TemplatesService.cs             |    2 +-
 .../Emails/EmailLogAttachment.cs              |    3 +-
 .../Emails/IEmailLogAttachmentRepository.cs   |    1 +
 ...cationsDbContextModelCreatingExtensions.cs |    8 +
 .../EmailLogAttachmentRepository.cs           |   12 +-
 .../NotificationsSettingGroup/Default.cshtml  |   15 +-
 .../NotificationsSettingGroup/Default.css     |  212 +-
 .../NotificationsSettingGroup/Default.js      | 1226 ++--
 .../_TemplateDetails.cshtml                   |   52 +
 .../_Templates.cshtml                         |   42 +
 .../DateBasedScheduledNotificationJob.cs      |    2 +-
 .../ApplicationLinksAppService.cs             |    6 +-
 ...24175515_AlterEmailAttachments.Designer.cs | 5227 +++++++++++++++++
 .../20260624175515_AlterEmailAttachments.cs   |   98 +
 .../GrantTenantDbContextModelSnapshot.cs      |    3 +
 .../Controllers/AttachmentController.cs       |   50 +-
 .../FormNotificationsApiController.cs         |   22 +-
 .../ConfigurationManagement/Index.cshtml      |    4 -
 .../Pages/ConfigurationManagement/Index.css   |    3 +-
 .../Pages/ConfigurationManagement/Index.js    |   25 +-
 .../Components/EmailsWidget/Default.cshtml    |   36 +-
 .../Shared/Components/EmailsWidget/Default.js |   15 +-
 .../EmailsWidget/EmailsWidgetViewComponent.cs |    2 +-
 .../EmailsWidget/_EmailAttachments.cshtml     |   34 +
 .../Components/Notifications/Default.js       |   20 +-
 31 files changed, 6653 insertions(+), 556 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs
index bb9377063e..9efab060ab 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs
@@ -8,5 +8,6 @@ namespace Unity.Notifications.Emails;
 public interface IEmailLogAttachmentAppService : IApplicationService
 {
     Task<List<EmailLogAttachmentDto>> GetListByEmailLogIdAsync(Guid emailLogId);
+    Task<List<EmailLogAttachmentDto>> GetListByTemplateIdAsync(Guid templateId);
     Task DeleteAsync(Guid id);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs
index cdea764cb9..93a4e3588f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs
@@ -5,6 +5,6 @@ namespace Unity.Notifications.Emails;
 
 public interface IEmailLogAttachmentUploadService
 {
-    Task<EmailLogAttachmentDto> UploadAsync(Guid emailLogId, Guid? tenantId, string fileName, byte[] content, string contentType);
-    Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid emailLogId);
+    Task<EmailLogAttachmentDto> UploadAsync(Guid? emailLogId, Guid? templateId, Guid? tenantId, string fileName, byte[] content, string contentType);
+    Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid? emailLogId, Guid? templateId);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs
index 03793d3383..42c22f5d17 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs
@@ -38,13 +38,15 @@ public EmailAttachmentService(
     }
 
     public async Task<EmailLogAttachment> UploadAttachmentAsync(
-        Guid emailLogId,
+        Guid? emailLogId,
+        Guid? templateId,
         Guid? tenantId,
         string fileName,
         byte[] fileContent,
         string contentType)
     {
-        var s3Key = BuildS3Key(tenantId, emailLogId, fileName);
+        var guid = emailLogId ?? templateId ?? throw new ArgumentException("Either emailLogId or templateId must be provided.");
+        var s3Key = BuildS3Key(tenantId, guid, fileName);
         var bucket = _configuration[S3BucketConfigKey];
 
         // Upload to S3
@@ -68,6 +70,7 @@ public async Task<EmailLogAttachment> UploadAttachmentAsync(
         var attachment = new EmailLogAttachment
         {
             EmailLogId = emailLogId,
+            TemplateId = templateId,
             S3ObjectKey = s3Key,
             FileName = fileName,
             DisplayName = fileName,
@@ -102,14 +105,16 @@ public async Task<EmailLogAttachment> UploadAttachmentAsync(
     }
 
     public async Task<EmailLogAttachment> UploadUserAttachmentAsync(
-        Guid emailLogId,
+        Guid? emailLogId,
+        Guid? templateId,
         Guid? tenantId,
         string fileName,
         byte[] fileContent,
         string contentType)
     {
         var uniqueKey = Guid.NewGuid();
-        var s3Key = BuildUserAttachmentS3Key(tenantId, emailLogId, uniqueKey, fileName);
+        Guid generateGuid = emailLogId ?? templateId ?? throw new ArgumentException("Either emailLogId or templateId must be provided.");
+        var s3Key = BuildUserAttachmentS3Key(tenantId, generateGuid, uniqueKey, fileName);
         var bucket = _configuration[S3BucketConfigKey];
 
         using var uploadStream = new MemoryStream(fileContent);
@@ -131,6 +136,7 @@ public async Task<EmailLogAttachment> UploadUserAttachmentAsync(
         var attachment = new EmailLogAttachment
         {
             EmailLogId = emailLogId,
+            TemplateId = templateId,
             S3ObjectKey = s3Key,
             FileName = fileName,
             DisplayName = fileName,
@@ -162,10 +168,22 @@ public async Task<List<EmailLogAttachment>> GetAttachmentsAsync(Guid emailLogId)
         return await _emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId);
     }
 
-    public async Task<long> GetTotalFileSizeAsync(Guid emailLogId)
+    public async Task<long> GetTotalFileSizeAsync(Guid? emailLogId, Guid? templateId)
     {
-        var attachments = await _emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId);
-        return attachments.Sum(a => a.FileSize);
+        if(emailLogId != null)
+        {
+            var attachments = await _emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId.Value);
+            return attachments.Sum(a => a.FileSize);
+        }
+        else if(templateId != null)
+        {
+            var attachments = await _emailLogAttachmentRepository.GetByTemplateIdAsync(templateId.Value);
+            return attachments.Sum(a => a.FileSize);
+        }
+        else
+        {
+            throw new ArgumentException("Either emailLogId or templateId must be provided.");
+        }
     }
 
     private static string BuildUserAttachmentS3Key(Guid? tenantId, Guid emailLogId, Guid attachmentId, string fileName)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
index 31a5a9b20b..e69f253077 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
@@ -20,9 +20,29 @@ public class EmailLogAttachmentAppService(
     EmailAttachmentService emailAttachmentService,
     IExternalUserLookupServiceProvider externalUserLookupServiceProvider) : ApplicationService, IEmailLogAttachmentAppService, IEmailLogAttachmentUploadService
 {
+
     public async Task<List<EmailLogAttachmentDto>> GetListByEmailLogIdAsync(Guid emailLogId)
     {
-        var attachments = await emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId);
+        return await GetListBydAsync(emailLogId, null);
+    }
+
+    public async Task<List<EmailLogAttachmentDto>> GetListByTemplateIdAsync(Guid templateId)
+    {
+        return await GetListBydAsync(null, templateId);
+    }
+        
+    public async Task<List<EmailLogAttachmentDto>> GetListBydAsync(Guid? emailLogId, Guid? templateId)
+    {
+        var attachments = new List<EmailLogAttachment>();
+        if (emailLogId.HasValue)
+        {
+            attachments = await emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId.Value);
+        }
+        else if (templateId.HasValue)
+        {
+            attachments = await emailLogAttachmentRepository.GetByTemplateIdAsync(templateId.Value);
+        }
+
         var dtos = new List<EmailLogAttachmentDto>();
 
         foreach (var attachment in attachments)
@@ -47,7 +67,24 @@ public async Task DeleteAsync(Guid id)
     {
         var attachment = await emailLogAttachmentRepository.GetAsync(id);
 
-        var emailLog = await emailLogsRepository.GetAsync(attachment.EmailLogId);
+        if (attachment == null)
+        {
+            throw new UserFriendlyException("Attachment not found.");
+        }
+
+        if (attachment.TemplateId.HasValue)
+        {
+            await emailAttachmentService.DeleteFromS3Async(attachment.S3ObjectKey);
+            await emailLogAttachmentRepository.DeleteAsync(id);
+            return;
+        }
+
+        if(attachment.EmailLogId == null)
+        {
+            throw new UserFriendlyException("Invalid email log ID.");
+        }
+
+        var emailLog = await emailLogsRepository.GetAsync(attachment.EmailLogId.Value);
         if (emailLog.Status != EmailStatus.Draft)
         {
             throw new UserFriendlyException("Attachments can only be deleted from draft emails.");
@@ -64,14 +101,14 @@ public async Task DeleteAsync(Guid id)
         await emailLogAttachmentRepository.DeleteAsync(id);
     }
 
-    public async Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid emailLogId)
+    public async Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid? emailLogId, Guid? templateId)
     {
-        return await emailAttachmentService.GetTotalFileSizeAsync(emailLogId);
+        return await emailAttachmentService.GetTotalFileSizeAsync(emailLogId, templateId);
     }
 
-    public async Task<EmailLogAttachmentDto> UploadAsync(Guid emailLogId, Guid? tenantId, string fileName, byte[] content, string contentType)
+    public async Task<EmailLogAttachmentDto> UploadAsync(Guid? emailLogId, Guid? templateId, Guid? tenantId, string fileName, byte[] content, string contentType)
     {
-        var attachment = await emailAttachmentService.UploadUserAttachmentAsync(emailLogId, tenantId, fileName, content, contentType);
+        var attachment = await emailAttachmentService.UploadUserAttachmentAsync(emailLogId, templateId, tenantId, fileName, content, contentType);
 
         return new EmailLogAttachmentDto
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
index 4de2379eee..580deb3c88 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
@@ -116,6 +116,7 @@ private async Task<EmailLog> InitializeEmailAndUploadAttachments(EmailInitParams
                     {
                         await emailAttachmentService.UploadAttachmentAsync(
                             emailLog.Id,
+                            null, // No templateId for user-uploaded attachments
                             emailLog.TenantId,
                             attachmentData.FileName,
                             attachmentData.Content,
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs
index 33dec9a293..b6f24d28a9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs
@@ -9,7 +9,7 @@ public interface ITemplateService : IApplicationService
     {
         Task<EmailTemplate?> CreateAsync(EmailTempateDto templateDto);
         Task<EmailTemplate?> UpdateTemplate(Guid id, EmailTempateDto templateDto);
-        Task<List<EmailTemplate>> GetTemplatesByTenent();
+        Task<List<EmailTemplate>> GetTemplatesByTenant();
         Task<EmailTemplate?> GetTemplateById(Guid id);
         Task DeleteTemplate(Guid id);
         Task<EmailTemplate?> GetTemplateByName(string name);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
index ee51827d0f..cdf6a6b354 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
@@ -60,7 +60,7 @@ ITemplateVariablesRepository templateVariablesRepository
         return updatedTemplate;
     }
 
-    public async Task<List<EmailTemplate>> GetTemplatesByTenent()
+    public async Task<List<EmailTemplate>> GetTemplatesByTenant()
     {
         var tenentId = _currentTenant.Id;
         return await _templatesRepository.GetByTenentIdAsync(tenentId);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
index 80db1b7ded..e617cfc77b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
@@ -8,7 +8,8 @@ namespace Unity.Notifications.Emails;
 public class EmailLogAttachment : AuditedAggregateRoot<Guid>, IMultiTenant
 {
     // Foreign key to EmailLog
-    public Guid EmailLogId { get; set; }
+    public Guid? EmailLogId { get; set; }
+    public Guid? TemplateId { get; set; }
 
     // S3 storage properties
     public string S3ObjectKey { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
index c265eff986..9e48798cf4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
@@ -8,4 +8,5 @@ namespace Unity.Notifications.Emails;
 public interface IEmailLogAttachmentRepository : IBasicRepository<EmailLogAttachment, Guid>
 {
     Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId);
+    Task<List<EmailLogAttachment>> GetByTemplateIdAsync(Guid templateId);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs
index d38c2e6713..8898ae6a8a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs
@@ -35,10 +35,18 @@ public static void ConfigureNotifications(
             // Foreign key to EmailLog with CASCADE delete
             b.HasOne<EmailLog>()
                 .WithMany()
+                .IsRequired(false)
                 .HasForeignKey(x => x.EmailLogId)
                 .OnDelete(DeleteBehavior.Cascade);
 
+            b.HasOne<EmailTemplate>()
+                .WithMany()
+                .IsRequired(false)
+                .HasForeignKey(x => x.TemplateId)
+                .OnDelete(DeleteBehavior.Cascade);                
+
             // Indexes for performance
+            b.HasIndex(x => x.TemplateId);
             b.HasIndex(x => x.EmailLogId);
             b.HasIndex(x => x.S3ObjectKey);
         });
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
index d8b1a13986..766db880aa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
@@ -10,18 +10,20 @@
 
 namespace Unity.Notifications.Repositories
 {
-    public class EmailLogAttachmentRepository : EfCoreRepository<NotificationsDbContext, EmailLogAttachment, Guid>,
+    public class EmailLogAttachmentRepository(IDbContextProvider<NotificationsDbContext> dbContextProvider) : 
+        EfCoreRepository<NotificationsDbContext, EmailLogAttachment, Guid>(dbContextProvider),
         IEmailLogAttachmentRepository
     {
-        public EmailLogAttachmentRepository(IDbContextProvider<NotificationsDbContext> dbContextProvider)
-            : base(dbContextProvider)
+        public async Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId)
         {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.Where(x => x.EmailLogId == emailLogId).ToListAsync();
         }
 
-        public async Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId)
+        public async Task<List<EmailLogAttachment>> GetByTemplateIdAsync(Guid templateId)
         {
             var dbSet = await GetDbSetAsync();
-            return await dbSet.Where(x => x.EmailLogId == emailLogId).ToListAsync();
+            return await dbSet.Where(x => x.TemplateId == templateId).ToListAsync();
         }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml
index de95d9181a..bdc9957838 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml
@@ -1,10 +1,6 @@
 @model Unity.Notifications.Web.Views.Settings.NotificationsSettingGroup.NotificationsSettingViewModel
 
 <div class="container-fluid px-0">
-    <div class="unity-page-titlebar">
-        <h4 class="m-0">Notifications</h4>
-    </div>
-
     <nav>
         <div class="nav nav-tabs" id="nav-tab" role="tablist">
             <button class="nav-link active" id="nav-mapping-tab" data-bs-toggle="tab" data-bs-target="#nav-config" type="button" role="tab">
@@ -68,16 +64,7 @@
         <!-- Email Templates -->
         <div class="tab-pane fade" id="nav-template" role="tabpanel" aria-labelledby="nav-template-tab">
             <div class="row">
-                <div class="container mt-3">
-                    <h3>Email Templates</h3>
-
-                    <abp-button id="CreateNewTemplate"
-                                text="+ Add Template"
-                                button-type="Primary"
-                                class="me-2 ms-auto" />
-
-                    <div id="cardContainer" class="v-scroll p-3"></div>
-                </div>
+                @await Html.PartialAsync("/Views/Settings/NotificationsSettingGroup/_Templates.cshtml")      
             </div>
         </div>
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
index e0b5931180..bb310dd62c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
@@ -12,10 +12,6 @@
     min-height:250px;
 }
 
-.note-text{
-    font-size:12px;
-}
-
 /* Group Users Table - Push remove button to far right */
 #groupUsersTable td:last-child,
 #createGroupUsersTable td:last-child {
@@ -74,3 +70,211 @@
 .modal-footer {
     margin-top: 10px;
 }
+
+
+/* ── Split-pane container ─────────────────────────────────────────────────── */
+.split-container {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    min-height: 400px;
+    gap: 0;
+    /* No fixed height — lets the DataTable footer and page footer remain visible */
+}
+
+/* ── Left pane ────────────────────────────────────────────────────────────── */
+.left-pane {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    transition: none;
+}
+
+/* ── Drag divider ─────────────────────────────────────────────────────────── */
+.split-divider {
+    display: none;
+    width: 7px;
+    flex-shrink: 0;
+    cursor: col-resize;
+    background: #dee2e6;
+    border-left: 1px solid #ced4da;
+    border-right: 1px solid #ced4da;
+    position: sticky;
+    top: 10px;
+    height: calc(100vh - 190px);
+    z-index: 10;
+    transition: background 0.15s;
+}
+
+.split-divider::after {
+    content: '⋮';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    color: #868e96;
+    font-size: 20px;
+    line-height: 1;
+    pointer-events: none;
+}
+
+.split-divider:hover,
+.split-divider.dragging {
+    background: #adb5bd;
+}
+
+.split-container.split-active .split-divider {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* ── Right pane ───────────────────────────────────────────────────────────── */
+.right-pane {
+    flex-shrink: 0;
+    width: 52%;
+    min-width: 300px;
+    max-width: 80%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    /* Sticky so the editor stays visible as the left-pane table grows */
+    position: sticky;
+    top: 10px;
+    /* Explicit height (not max-height) so h-100 on the inner card resolves correctly */
+    height: calc(100vh - 190px);
+}
+
+
+/* ── Editor header ────────────────────────────────────────────────── */
+.editor-header {
+    background: #f8f9fa;
+    position: absolute;
+    top: 0px;
+    width: 100%;    
+}
+
+/* ── Editor form body ─────────────────────────────────────────────── */
+.editor-body {
+    flex: 1 1 0;      /* 0 basis so flex shrinks below content natural size */
+    min-height: 0;    /* required for overflow-y:auto to work inside a flex column */
+    margin-top: 50px;
+    padding: 2px;
+}
+
+/* ── Resizable textareas ──────────────────────────────────────────────────── */
+.textarea {
+    resize: vertical;
+    min-height: 72px;
+    font-size: 0.82rem;
+    line-height: 1.5;
+}
+
+.template-field-div {
+  width: 100%;
+  max-width: none;
+  display: flex;
+}
+
+span.tooltip-wrapper {
+  flex: 1 1 auto;
+  width: 100%;
+  display: block;
+}
+
+.template-field {
+    flex: 0 0 135px !important;
+    width: 132px !important;
+    white-space: nowrap;
+    margin: 0.5rem;    
+}
+
+/* ── Drag ghost (prevent text selection while dragging) ───────────────────── */
+body.split-dragging {
+    cursor: col-resize !important;
+    user-select: none !important;
+}
+
+
+.tox-tinymce {
+    width: 100%;
+}
+
+.info-note {
+    background-color: #d1ecf1;
+    border: 1px solid #bee5eb;
+    color: #0c5460;
+    padding: 12px 16px;
+    margin: 16px;
+    border-radius: 4px;
+    font-size: 0.95rem;
+    line-height: 1.5;
+}
+
+/* ── Templates Table Layout Optimization ────────────────────────────────────── */
+
+/* Force the table to respect container bounds */
+#TemplatesTable {
+    table-layout: fixed !important;
+    width: 100% !important;
+}
+
+/* Update Column Widths via colgroup/col (essential for DataTables-style tables) */
+#TemplatesTable col:nth-child(1) { 
+    width: 25% !important; /* Name */
+}
+
+#TemplatesTable col:nth-child(2) { 
+    width: 60% !important; /* Subject */
+}
+
+#TemplatesTable col:nth-child(3) { 
+    width: 15% !important; /* Actions */
+    min-width: 150px !important;
+}
+
+/* Handle text truncation for the content columns */
+#TemplatesTable td:nth-child(1),
+#TemplatesTable td:nth-child(2) {
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+}
+
+/* Ensure the Actions container does not wrap or expand */
+#TemplatesTable .d-inline-flex.gap-2 {
+    flex-wrap: nowrap !important;
+    width: auto !important;
+}
+
+/* Prevent the container from enabling horizontal scroll */
+.dt-scroll-body {
+    overflow-x: hidden !important;
+    scrollbar-gutter: stable; /* Reserves space for vertical scrollbar to prevent layout shift */
+}
+
+/* ── Form Validation Styling ─────────────────────────────────────────────────── */
+
+/* Hide validation symbol in invalid form controls */
+.form-control.is-invalid {
+    background-image: none !important;
+}
+
+/* ── Button Styling ──────────────────────────────────────────────────────────── */
+
+/* Gray outline buttons with secondary icon color */
+.btn-action-gray {
+    border-color: #6c757d !important;
+    color: #6c757d !important;
+}
+
+.btn-action-gray:hover {
+    border-color: #5a6268 !important;
+    color: #5a6268 !important;
+}
+
+/* Hidden button state */
+.btn-hidden {
+    display: none !important;
+}
+
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
index ca8c59cccd..3f97df7bf6 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
@@ -1,142 +1,508 @@
-$(function () {
-    loadCardsFromService();
-    const NotificationUiElements = {
-        settingForm: $("#NotificationsSettingsForm"),
-        saveButton: $("#NotificationsSaveButton"),
-        discardButton: $("#NotificationsDiscardButton")
+
+$(function () {
+
+    let dropdownItems = [];
+    let emailAttachmentsTable = null;
+    let templatesDataTable = null;
+    let originalFormValues = {};
+
+    const UiElements = {
+        saveButton: $("#saveTemplateBtn"),
+        discardButton: $("#discardTemaplateBtn"),
+        deleteButton: $("#deleteTeamplateBtn"),
+        closeButton: $("#closeTemplateBtn"),
+        addTemplateButton: $("#CreateNewTemplate"),
+        templatesTable: $('#TemplatesTable')
+    }
+
+    function init() {
+        $('#email-attachments-section').hide();
+        initializeTemplateDataTables();
+        initializeDivider();
+        initializeTabPersistence();
+    }
+
+    init();
+
+    // ── Tab State Persistence ─────────────────────────────────────────────
+    function initializeTabPersistence() {
+        const tabContainer = $('#nav-tab');
+        
+        // Restore saved tab on page load
+        const savedTabId = localStorage.getItem('notifications-active-tab');
+        if (savedTabId) {
+            const tabButton = tabContainer.find(`#${savedTabId}`);
+            if (tabButton.length) {
+                const tab = new bootstrap.Tab(tabButton[0]);
+                tab.show();
+            }
+        }
+        
+        // Save tab selection when tab changes
+        tabContainer.on('shown.bs.tab', 'button[data-bs-toggle="tab"]', function () {
+            localStorage.setItem('notifications-active-tab', this.id);
+        });
+    }
+
+    // ── Field validation helpers ──────────────────────────────────────────
+    function checkTemplateNameUnique(name, currentId, callback) {
+        $.ajax({
+            url: `/api/app/template/template-by-name?name=${encodeURIComponent(name)}`,
+            type: 'GET',
+            success: function (response) {
+                const isUnique = !response?.id || response.id === currentId;
+                callback(isUnique);
+            },
+            error: function () {
+                // If check fails, allow save to proceed
+                callback(true);
+            }
+        });
     }
 
-    let initialFormState = NotificationUiElements.settingForm.serialize();
+    function clearFieldError(fieldId) {
+        $(`#${fieldId}`).removeClass('is-invalid');
+        $(`#${fieldId}-error`).text('').hide();
+    }
 
-    function checkFormChanges() {
-        let currentFormState = NotificationUiElements.settingForm.serialize();
-        let isFormChanged = currentFormState !== initialFormState;
+    function markFieldError(fieldId, errorMessage) {
+        $(`#${fieldId}`).addClass('is-invalid');
+        $(`#${fieldId}-error`).text(errorMessage).show();
+    }
 
-        NotificationUiElements.saveButton.prop('disabled', !isFormChanged);
-        NotificationUiElements.discardButton.prop('disabled', !isFormChanged);
+    function clearAllErrors() {
+        $('#templateName, #sendFrom, #subject, #templateBody').removeClass('is-invalid');
+        $('#templateName-error, #sendFrom-error, #subject-error, #templateBody-error').text('').hide();
     }
 
-    NotificationUiElements.settingForm.on('input change', function () {
-        checkFormChanges();
+    // Listen for user input to clear error styling
+    $('#templateName, #sendFrom, #subject').on('input', function () {
+        clearFieldError(this.id);
     });
 
-    NotificationUiElements.settingForm.on('submit', function (event) {
-        event.preventDefault();
+    $('#templateBody').on('input change', function () {
+        clearFieldError(this.id);
+    });
 
-        if (!$(this).valid()) {
-            return;
+    // ── Open / close right panel ──────────────────────────────────────────
+    function openRightPanel() {           
+        // Activate split layout
+        $('#splitContainer').addClass('split-active');
+        $('#rightPane').show();
+        if (templatesDataTable) {
+            templatesDataTable.columns.adjust();
         }
+    }
 
-        let form = $(this).serializeFormToObject();
-        unity.notifications.emailNotifications.emailNotification.updateSettings(form).then(function (result) {
-            $(document).trigger("AbpSettingSaved");
-            initialFormState = NotificationUiElements.settingForm.serialize();
-            checkFormChanges();
-        });
+    function closeRightPanel() {
+        // Deactivate split layout
+        $('#splitContainer').removeClass('split-active');
+        $('#rightPane').hide();
+        $('#leftPane').css('flex', '');
+        UiElements.deleteButton.hide();
+        if (templatesDataTable) {
+            templatesDataTable.columns.adjust();
+        }
+    }
 
+    function populateFields(data) {
+        // Store original values for discard functionality
+        originalFormValues = {
+            id: data.id,
+            name: data.name,
+            description: data.description || '',
+            sendFrom: data.sendFrom,
+            subject: data.subject,
+            bodyText: data.bodyText || '',
+            bodyHTML: data.bodyHTML
+        };
+        
+        $('#templateId').val(data.id);
+        $('#templateName').val(data.name);
+        $('#sendFrom').val(data.sendFrom);
+        $('#subject').val(data.subject);
+        UiElements.deleteButton.show();
+        $('#email-attachments-section').show();
+        initEmailAttachmentsTable(data.id);
+    }
+
+    function populateFieldsForNewTemplate() {
+        // Store original values as empty for new template
+        originalFormValues = {
+            id: '',
+            name: '',
+            description: '',
+            sendFrom: '',
+            subject: '',
+            bodyText: '',
+            bodyHTML: ''
+        };
+        
+        $('#templateId').val('');
+        $('#templateName').val('');
+        $('#sendFrom').val('');
+        $('#subject').val('');
+        UiElements.deleteButton.hide();
+        $('#email-attachments-section').hide();
+        // Don't load attachments for new templates - they have no ID yet
+    }
+
+    UiElements.discardButton.on('click', function () {
+        if (Object.keys(originalFormValues).length > 0) {
+            $('#templateId').val(originalFormValues.id);
+            $('#templateName').val(originalFormValues.name);
+            $('#sendFrom').val(originalFormValues.sendFrom);
+            $('#subject').val(originalFormValues.subject);
+            const editor = tinymce.get('templateBody');
+            if (editor) {
+                editor.setContent(originalFormValues.bodyHTML || '');
+            }
+        }
     });
 
-    NotificationUiElements.discardButton.on('click', function () {
-        NotificationUiElements.settingForm[0].reset();
-        initialFormState = NotificationUiElements.settingForm.serialize();
-        checkFormChanges();
+    UiElements.closeButton.on('click', function () {
+        closeRightPanel();
     });
 
-    checkFormChanges();
+    UiElements.saveButton.on('click', function () {
+        const templateId = $('#templateId').val();
+        const templateName = $('#templateName').val();
+        const sendFrom = $('#sendFrom').val();
+        const subject = $('#subject').val();
+        const editor = tinymce.get('templateBody');
+        const bodyHTML = editor ? editor.getContent().trim() : '';
 
-    let editorInstances = {};
+        // Clear all previous error styles
+        clearAllErrors();
 
-    // Utility function for debouncing
-    function debounce(func, delay) {
-        let timeoutId;
-        return function (...args) {
-            clearTimeout(timeoutId);
-            timeoutId = setTimeout(() => func.apply(this, args), delay);
-        };
-    }
+        // Collect all validation errors
+        const validationErrors = [];
+
+        if (!templateName?.trim()) {
+            validationErrors.push('Template name is required.');
+            markFieldError('templateName', 'Template name is required.');
+        }
+        if (!sendFrom?.trim()) {
+            validationErrors.push('Send From is required.');
+            markFieldError('sendFrom', 'Send From is required.');
+        } else if (!isValidEmail(sendFrom.trim())) {
+            validationErrors.push('Send From must be a valid email address.');
+            markFieldError('sendFrom', 'Send From must be a valid email address.');
+        }
+        if (!subject?.trim()) {
+            validationErrors.push('Subject is required.');
+            markFieldError('subject', 'Subject is required.');
+        }
+        if (!bodyHTML) {
+            validationErrors.push('Template body is required.');
+            markFieldError('templateBody', 'Template body is required.');
+        }
 
-    // Utility functions for template operations
-    function extractFormData(formDataArray) {
-        return {
-            name: formDataArray[0].value,
-            sendFrom: formDataArray[1].value,
-            subject: formDataArray[2].value
+        // Show single error popup if there are validation errors
+        if (validationErrors.length > 0) {
+            return abp.notify.error(validationErrors.join('<br>'));
+        }
+
+        const templateData = {
+            name: templateName,
+            description: '',
+            sendFrom: sendFrom,
+            subject: subject,
+            bodyText: '',
+            bodyHTML: bodyHTML
         };
-    }
 
-    function buildTemplatePayload(data, editor) {
-        return JSON.stringify({
-            name: data.name,
-            description: "",
-            subject: data.subject,
-            bodyText: editor.getContent({ format: 'text' }),
-            bodyHTML: editor.getContent(),
-            sendFrom: data.sendFrom
+        const isNewTemplate = !templateId || templateId.trim() === '';
+
+        // Check template name uniqueness before saving
+        checkTemplateNameUnique(templateName.trim(), templateId, function (isUnique) {
+            if (!isUnique) {
+                markFieldError('templateName', 'Template name must be unique.');
+                return;
+            }
+            performSave(isNewTemplate, templateId, templateData, templateName, sendFrom, subject, bodyHTML);
         });
-    }
+    });
 
-    function handleSuccess(message) {
-        abp.notify.success(message);
-        $("#cardContainer").empty();
-        loadCardsFromService();
-        return true;
+    function performSave(isNewTemplate, templateId, templateData, templateName, sendFrom, subject, bodyHTML) {
+        if (isNewTemplate) {
+            // Create new template
+            unity.notifications.templates.template
+                .create(templateData)
+                .then(function (response) {
+                    abp.notify.success('Template created successfully.');
+                    // Populate templateId with returned ID
+                    $('#templateId').val(response.id);
+                    // Update original values with new template ID and data
+                    originalFormValues = {
+                        id: response.id,
+                        name: templateName,
+                        description: '',
+                        sendFrom: sendFrom,
+                        subject: subject,
+                        bodyText: '',
+                        bodyHTML: bodyHTML
+                    };
+                    // Now show attachments section and initialize table
+                    $('#email-attachments-section').show();
+                    initEmailAttachmentsTable(response.id);
+                    UiElements.deleteButton.show();
+                    // Reload templates list
+                    PubSub.publish('reload_templates_table_no_close');
+                })
+                .catch(function (e) {
+                    console.warn('Failed to create template:', e);
+                    abp.notify.error('Failed to create template.');
+                });
+        } else {
+            // Update existing template
+            unity.notifications.templates.template
+                .updateTemplate(templateId, templateData)
+                .then(function () {
+                    abp.notify.success('Template updated successfully.');
+                    // Update original values after successful save
+                    originalFormValues = {
+                        id: templateId,
+                        name: templateName,
+                        description: '',
+                        sendFrom: sendFrom,
+                        subject: subject,
+                        bodyText: '',
+                        bodyHTML: bodyHTML
+                    };
+                    PubSub.publish('reload_templates_table_no_close');
+                })
+                .catch(function (e) {
+                    console.warn('Failed to update template:', e);
+                    abp.notify.error('Failed to update template.');
+                });
+        }
     }
 
-    function handleError(message) {
-        abp.notify.error(message);
-        return false;
-    }
+    UiElements.addTemplateButton.on('click', function () {
+        // Initialize template variables if needed
+        initializeTemplateVariables();
+        
+        // Initialize editor with empty data
+        initializeEditor({ bodyHTML: '' }, dropdownItems);
+        
+        // Populate fields with empty values for new template
+        populateFieldsForNewTemplate();
+        
+        // Highlight nothing in the table
+        $('#TemplatesTable tbody tr').removeClass('template-selected');
+        
+        // Open right panel
+        openRightPanel();
+    });
 
-    function onSaveTemplateSuccess() {
-        handleSuccess('Template saved successfully.');
+    function proceedWithDelete(templateId, onDelete) {
+        // Destroy attachments table before deleting
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.destroy();
+            emailAttachmentsTable = null;
+        }
+        unity.notifications.templates.template
+            .deleteTemplate(templateId)
+            .then(function () {
+                abp.notify.success('Template deleted successfully.');
+                onDelete();
+            })
+            .catch(function (e) {
+                console.warn('Failed to delete template:', e);
+                abp.notify.error('Failed to delete template.');
+            });
     }
 
-    function onSaveTemplateError() {
-        handleError('Failed to save template.');
-    }
+    UiElements.deleteButton.on('click', function () {
+        let templateId = $('#templateId').val();
+        abp.message.confirm(
+            'Are you sure you want to delete this template?',
+            'Delete Template',
+            function (confirmed) {
+                if (confirmed) {
+                    $.ajax({
+                        url: `/api/form-notifications/can-delete-template/${templateId}`,
+                        type: 'GET',
+                        success: function (response) {
+                            if (response.canDelete) {
+                                proceedWithDelete(templateId, function () {
+                                    PubSub.publish('reload_templates_table_with_close');
+                                });
+                            } else {
+                                abp.notify.error(response.errorMessage || 'This template cannot be deleted because it is currently in use.');
+                            }
+                        },
+                        error: function () {
+                            // If check fails, proceed with deletion
+                            proceedWithDelete(templateId, function () {
+                                PubSub.publish('reload_templates_table_with_close');
+                            });
+                        }
+                    });
+                }
+            }
+        );
 
-    function saveTemplate(payload) {
-        $.ajax({
-            url: `/api/app/template`,
-            method: 'POST',
-            contentType: 'application/json',
-            data: payload,
-            success: onSaveTemplateSuccess,
-            error: onSaveTemplateError
+    });
+
+    function initializeTemplateDataTables() {                
+        // ── Table columns ────────────────────────────────────────────────────────
+        const listColumns = [
+            {
+                title: 'Id',
+                name: 'id',
+                data: 'id',
+                visible: false,
+                index: 0
+            },        
+            {
+                title: 'Name',
+                name: 'name',
+                data: 'name',
+                index: 1
+            },
+            {
+                title: 'Subject',
+                name: 'subject',
+                data: 'subject',
+                index: 2
+            },
+            {
+                title: 'Actions',
+                name: 'actions',
+                data: 'id',
+                orderable: false,
+                searchable: false,
+                index: 3,
+                width: '210px',
+                render: function (data, type, row) {
+                    return `
+                        <div class="d-inline-flex gap-2">
+                            <button class="btn btn-sm btn-action-gray template-edit-btn" data-id="${data}" title="Edit">
+                                <i class="fl fl-edit"></i>
+                            </button>
+                            <button class="btn btn-sm btn-action-gray template-delete-btn" data-id="${data}" title="Delete">
+                                <i class="fl fl-cancel"></i>
+                            </button>
+                        </div>
+                    `;
+                }
+            }       
+        ];
+
+        const responseCallback = (result) => (        
+            {        
+                recordsTotal:    result.length,
+                recordsFiltered: result.length,
+                data:            result
+            }
+        );
+
+        const actionButtons = [
+            {
+            }
+        ];
+
+        const defaultVisibleColumns = ['name', 'subject', 'actions'];
+        const dt = $('#TemplatesTable');
+
+        templatesDataTable = initializeDataTable({
+            dt,
+            defaultVisibleColumns,
+            listColumns,
+            maxRowsPerPage: 25,
+            defaultSortColumn: 0,
+            dataEndpoint: unity.notifications.templates.template.getTemplatesByTenant,
+            data: {},
+            responseCallback,
+            actionButtons,
+            pagingEnabled: true,
+            reorderEnabled: false,
+            languageSetValues: {},
+            dataTableName: 'TemplatesTable',
+            dynamicButtonContainerId: 'dynamicButtonContainerId',
+            useNullPlaceholder: true,
+            externalSearchId: 'search-prompts',
+            fixedHeaders: true
         });
-    }
 
-    function updateTemplate(id, payload) {
-        $.ajax({
-            url: `/api/app/template/${id}/template`,
-            method: 'PUT',
-            contentType: 'application/json',
-            data: payload,
-            success: onSaveTemplateSuccess,
-            error: onSaveTemplateError
+        // ── Row click → open version panel ──────────────────────────────────────
+        $('#TemplatesTable').on('click', 'tbody tr', function (e) {
+            // Don't intercept action-column clicks
+            if ($(e.target).closest('.dropdown, .dropdown-menu, button, a').length) return;
+
+            const rowData = templatesDataTable.row(this).data();
+            if (!rowData) return;
+
+            // Initialize the tinymce editor with the selected template data
+            initializeTemplateVariables();
+            initializeEditor(rowData, dropdownItems);
+            populateFields(rowData);
+
+            // Highlight selected row
+            $('#TemplatesTable tbody tr').removeClass('template-selected');
+            $(this).addClass('template-selected');            
+            openRightPanel();
         });
-    }
 
-    function checkTemplateNameUnique(name, currentId, callback) {
-        $.ajax({
-            url: `/api/app/template/template-by-name?name=${encodeURIComponent(name)}`,
-            type: 'GET',
-            success: function (response) {
-                const wrapperId = `cardWrapper-${currentId}`;
-                const isSameAsCurrent = !currentId.includes('temp') && name === $(`#${wrapperId}`).data('original-name');
-                let isExist = false;
-                if (response?.id) {
-                    isExist = true;
+        // ── Edit button click ──────────────────────────────────────────────────
+        $('#TemplatesTable').on('click', '.template-edit-btn', function (e) {
+            e.stopPropagation();
+            const templateId = $(this).data('id');
+            const rowData = templatesDataTable.row($(this).closest('tr')).data();
+            
+            if (!rowData) return;
+            
+            initializeTemplateVariables();
+            initializeEditor(rowData, dropdownItems);
+            populateFields(rowData);
+            
+            // Highlight selected row
+            $('#TemplatesTable tbody tr').removeClass('template-selected');
+            $(this).closest('tr').addClass('template-selected');
+            openRightPanel();
+        });
+
+        // ── Delete button click ────────────────────────────────────────────────
+        $('#TemplatesTable').on('click', '.template-delete-btn', function (e) {
+            e.stopPropagation();
+            const templateId = $(this).data('id');
+            
+            abp.message.confirm(
+                'Are you sure you want to delete this template?',
+                'Delete Template',
+                function (confirmed) {
+                    if (confirmed) {
+                        $.ajax({
+                            url: `/api/form-notifications/can-delete-template/${templateId}`,
+                            type: 'GET',
+                            success: function (response) {
+                                if (response.canDelete) {
+                                    proceedWithDelete(templateId, function () {
+                                        PubSub.publish('reload_templates_table_with_close');
+                                    });
+                                } else {
+                                    abp.notify.error(response.errorMessage || 'This template cannot be deleted because it is currently in use.');
+                                }
+                            },
+                            error: function () {
+                                // If check fails, proceed with deletion
+                                proceedWithDelete(templateId, function () {
+                                    PubSub.publish('reload_templates_table_with_close');
+                                });
+                            }
+                        });
+                    }
                 }
-                callback(!isExist || isSameAsCurrent);
-            },
-            error: function () {
-                callback(false);
-            }
+            );
         });
+
+        // Removed nested functions - now defined at global scope above
     }
 
-    function getTemplateVariables(dropdownItems) {
+
+    function initializeTemplateVariables() {
         $.ajax({
             url: `/api/app/template/template-variables`,
             type: 'GET',
@@ -154,365 +520,385 @@
         });
     }
 
-    function showDeleteConfirmation(id, wrapperId) {
-        const swalOptions = {
-            title: "Delete Template",
-            text: "Are you sure you want to delete this template?",
-            showCancelButton: true,
-            confirmButtonText: "Confirm",
-            customClass: {
-                confirmButton: 'btn btn-primary',
-                cancelButton: 'btn btn-secondary'
-            }
-        };
+    function initEmailAttachmentsTable(templateId) {
+        // Destroy existing table if it exists
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.destroy();
+            emailAttachmentsTable = null;
+        }
 
-        Swal.fire(swalOptions).then(function(result) {
-            handleDeleteConfirmation(result, id, wrapperId);
-        });
-    }
+        // Skip initialization if no template ID provided
+        if (!templateId) {
+            return;
+        }
 
-    function handleDeleteConfirmation(result, id, wrapperId) {
-        if (!result.isConfirmed) return;
-        deleteTemplate(id, wrapperId);
+        emailAttachmentsTable = $('#EmailAttachmentsTable').DataTable(
+            abp.libs.datatables.normalizeConfiguration({
+                serverSide: false,
+                order: [[2, 'asc']],
+                searching: false,
+                paging: false,
+                select: false,
+                info: false,
+                scrollX: true,
+                scrollY: '200px',
+                scrollCollapse: true,
+                ajax: abp.libs.datatables.createAjax(
+                    unity.notifications.emails.emailLogAttachment.getListByTemplateId,
+                    function () { return templateId; },
+                    function (result) { return { data: result }; }
+                ),
+                columnDefs: [
+                    {
+                        title: '<i class="fl fl-paperclip"></i>',
+                        width: '40px',
+                        className: 'text-center',
+                        orderable: false,
+                        render: function () {
+                            return '<i class="fl fl-paperclip"></i>';
+                        }
+                    },
+                    {
+                        title: 'Document Name',
+                        data: 'fileName',
+                        className: 'data-table-header text-break',
+                        width: '40%'
+                    },
+                    {
+                        title: 'Date',
+                        data: 'time',
+                        className: 'data-table-header',
+                        width: '130px',
+                        render: function (data, type) {
+                            if (type === 'display' || type === 'filter') {
+                                return new Date(data).toDateString();
+                            }
+                            return data;
+                        }
+                    },
+                    {
+                        title: 'Attached by',
+                        data: 'attachedBy',
+                        className: 'data-table-header',
+                        width: '25%'
+                    },
+                    {
+                        title: 'File Size',
+                        data: 'fileSize',
+                        className: 'data-table-header',
+                        width: '90px',
+                        render: function (data) {
+                            if (!data) return '—';
+                            const mb = data * 0.000001;
+                            return mb >= 1 ? mb.toFixed(2) + ' MB' : (data / 1024).toFixed(0) + ' KB';
+                        }
+                    },
+                    {
+                        title: '',
+                        data: 'id',
+                        width: '80px',
+                        className: 'text-center',
+                        orderable: false,
+                        render: function (data) {
+                            return generateEmailAttachmentButtonContent(data);
+                        }
+                    }
+                ],
+                drawCallback: function () {
+                }
+            })
+        );
     }
 
-    function handleDeleteSuccess(wrapperId) {
-        return function() {
-            $(`#${wrapperId}`).remove();
-            abp.notify.success('Template deleted successfully.');
-        };
-    }
 
-    function handleDeleteError() {
-        abp.notify.error('Error deleting the template.');
-    }
+    $('#email_attachment_upload_btn').on('click', function () {
+        $('#email_attachment_upload').click();
+    });
 
-    function deleteTemplate(id, wrapperId) {
-        $.ajax({
-            url: `/api/app/template/${id}/template`,
-            type: 'DELETE',
-            success: handleDeleteSuccess(wrapperId),
-            error: handleDeleteError
-        });
-    }
+    $('#email_attachment_upload').on('change', function () {
+        uploadEmailFiles('email_attachment_upload');
+    });
 
-    // Helper functions moved outside of createCard to reduce complexity
-    function getCardLastEditedDate(data) {
-        if (data?.lastModificationTime) {
-            return new Date(data.lastModificationTime).toLocaleDateString('en-CA');
-        } else if (data?.creationTime) {
-            return new Date(data.creationTime).toLocaleDateString('en-CA');
-        } else {
-            return new Date().toLocaleDateString('en-CA');
-        }
-    }
+    function uploadEmailFiles(inputId) {
+        const templateId = $('#templateId').val();
+        const input = document.getElementById(inputId);
+        if (!input?.files?.length) return;
 
-    function generateCardHtml(cardConfig) {
-        const { 
-            data, 
-            elementIds, 
-            displayInfo, 
-            isPopulated 
-        } = cardConfig;
-        
-        const disabled = isPopulated ? 'disabled' : '';
-        const cardDataId = data?.id?.toString() || elementIds.wrapperId;
-        
-        return `
-        <div class="card mb-3 shadow-sm" id="${elementIds.wrapperId}" data-id="${cardDataId}">
-            <div class="card-header d-flex justify-content-between align-items-center">
-                <strong class="template-title">${data?.name || 'Untitled Template'}</strong>
-                <div class="d-flex align-items-center gap-3">
-                    <div class="text-muted small text-end me-3">
-                        <div>Type<br /><span class="fw-normal">${displayInfo.type}</span></div>
-                    </div>
-                    <div class="text-muted small text-end me-3">
-                        <div>Last Edited<br /><span class="fw-normal">${displayInfo.lastEdited}</span></div>
-                    </div>
-                    <button class="btn btn-sm btn-link text-decoration-none" type="button"
-                        data-bs-toggle="collapse" data-bs-target="#${elementIds.cardId}" aria-expanded="false"
-                        aria-controls="${elementIds.cardId}">
-                        <i class="unt-icon-sm fa-solid fa-chevron-down"></i>
-                    </button>
-                </div>
-            </div>
-            <div class="collapse" id="${elementIds.cardId}">
-                <div class="card-body">
-                    <form id="${elementIds.formId}">
-                        <div class="mb-3">
-                            <label class="form-label">Template Name</label>
-                            <input type="text" class="form-control form-input" name="templateName" value="${data?.name || ''}" ${disabled} required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Send From</label>
-                            <input type="text" class="form-control form-input" name="sendFrom" value="${data?.sendFrom || ''}" ${disabled} required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Subject</label>
-                            <input type="text" class="form-control form-input" name="subject" value="${data?.subject || ''}" ${disabled} required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Body</label>
-                            <textarea id="${elementIds.editorId}"></textarea>
-                        </div>
-                         <div class="mb-3">
-                         <p><b>NOTE</b>:<span class="note-text"> Selecting text will let you customize it: replace it with a variable, make it bold, italic, change the alignment, add a link, create a list, etc.</span></p>
-                         </div>
-                         <div class="mb-3">
-                         <hr>
-                         <button type="button" class="btn btn-outline-primary deleteCardBtn">X DELETE THIS TEMPLATE</button>
-                         <hr>
-                         </div>
-                        <div class="d-flex gap-2">
-                            ${isPopulated ? `<button type="submit" class="btn btn-primary  saveBtn" disabled>SAVE CHANGES</button>` : `<button type="submit" class="btn btn-primary saveBtn">SAVE CHANGES</button>`}
-                            <button type="button" class="btn btn-outline-secondary discardBtn d-none">DISCARD CHANGES</button>
-                            ${isPopulated ? `<button type="button" class="btn btn-secondary editBtn">EDIT THIS TEMPLATE</button>` : ''}
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    `;
-    }
+        const disallowedTypes = JSON.parse(decodeURIComponent($('#Extensions').val()));
+        const maxFileSize = decodeURIComponent($('#EmailAttachmentMaxFileSize').val());
 
-    function initializeEditor(editorId, id, data, isPopulated, dropdownItems) {        
-        if (tinymce.get(editorId)) {
-            tinymce.get(editorId).remove();
-        }
+        let isAllowedTypeError = false;
+        let isMaxFileSizeError = false;
+        const formData = new FormData();
 
-        tinymce.init({
-            license_key: 'gpl',
-            selector: `#${editorId}`,
-            plugins: 'lists link image preview code',
-            toolbar: 'undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview | variablesDropdownButton',
-            resize: true,
-            statusbar: true,
-            elementpath: false,
-            branding: false,
-            promotion: false,
-            content_css: false,
-            skin: false,
-            setup: function (editor) {                
-                setupEditor(editor, id, editorId, data, isPopulated, dropdownItems);
+        for (let file of input.files) {
+            const ext = file.name.slice(file.name.lastIndexOf('.') + 1).toLowerCase();
+            if (disallowedTypes.includes(ext)) {
+                isAllowedTypeError = true;
             }
-        });
-    }
-
-    function createMenuItems(dropdownItems, editor) {
-        return dropdownItems.map(item => ({
-            type: 'menuitem',
-            text: item.text,
-            onAction: () => {
-                editor.insertContent(`{{${item.value}}}`);
+            if (file.size * 0.000001 > maxFileSize) {
+                isMaxFileSizeError = true;
             }
-        }));
-    }
+            formData.append('files', file);
+        }
 
-    function fetchVariablesMenuItems(dropdownItems, editor) {
-        return function (callback) {
-            const items = createMenuItems(dropdownItems, editor);
-            callback(items);
-        };
-    }
+        if (isAllowedTypeError) {
+            input.value = '';
+            return abp.notify.error('Error', 'File type not supported');
+        }
+        if (isMaxFileSizeError) {
+            input.value = '';
+            return abp.notify.error(
+                'File Too Large',
+                'The selected file exceeds the maximum allowed size of ' + maxFileSize + ' MB for email attachments. Please select a smaller file.'
+            );
+        }
 
-    function setupEditor(editor, id, editorId, data, isPopulated, dropdownItems) {
-        editor.ui.registry.addMenuButton('variablesDropdownButton', {
-            text: 'VARIABLES',
-            fetch: fetchVariablesMenuItems(dropdownItems, editor)
-        });
+        const totalMaxFileSize = Number.parseFloat(
+            decodeURIComponent($('#TotalEmailAttachmentMaxFileSize').val()) || '25'
+        );
+        let existingTotalBytes = 0;
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.rows().data().each(function (row) {
+                existingTotalBytes += (row.fileSize || 0);
+            });
+        }
+        let newFilesBytes = 0;
+        for (let file of input.files) {
+            newFilesBytes += file.size;
+        }
+        const combinedMB = (existingTotalBytes + newFilesBytes) * 0.000001;
+        if (combinedMB > totalMaxFileSize) {
+            input.value = '';
+            return abp.notify.error(
+                'Total Size Exceeded',
+                'The total size of all attachments would exceed the maximum allowed ' + totalMaxFileSize +
+                ' MB. Please remove existing attachments or select a smaller file.'
+            );
+        }
 
-        editor.on('init', function () {
-            editor.mode.set(isPopulated ? 'readonly' : 'design');
-            if (data?.bodyHTML) {
-                editor.setContent(data.bodyHTML);
+        $.ajax({
+            url: `/api/app/attachment/template/${templateId}/upload`,
+            type: 'POST',
+            data: formData,
+            processData: false,
+            contentType: false,
+            xhr: function () {
+                const xhr = new globalThis.XMLHttpRequest();
+                xhr.upload.addEventListener('progress', function (e) {
+                    if (e.lengthComputable) {
+                        const pct = Math.round((e.loaded / e.total) * 100);
+                        $('#attachment-upload-progress-bar')
+                            .css('width', pct + '%')
+                            .attr('value', pct)
+                            .text(pct + '%');
+                    }
+                });
+                return xhr;
+            },
+            beforeSend: function () {
+                $('#email_attachment_upload_btn')
+                    .html('<span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>Uploading...')
+                    .prop('disabled', true);
+                $('#attachment-upload-progress-bar').css('width', '0%').text('0%');
+                $('#attachment-upload-progress').show();
+            },
+            success: function () {
+                PubSub.publish('reload_email_attachments_table');
+            },
+            error: function (xhr) {
+                abp.notify.error(xhr.responseText || 'Failed to upload attachment.');
+            },
+            complete: function () {
+                input.value = '';
+                $('#email_attachment_upload_btn')
+                    .html('<i class="fl fl-plus me-1"></i>Add Attachments')
+                    .prop('disabled', false);
+                $('#attachment-upload-progress').hide();
             }
-            editorInstances[id] = editor;            
         });
     }
 
-    function setupCardEventHandlers(cardData) {
-        const { id, formId, cardId, wrapperId, editorId, data, isPopulated, dropdownItems } = cardData;
+    // ── Draggable divider ─────────────────────────────────────────────────────
+    function initializeDivider() {
         
-        setupTemplateNameValidation(formId, wrapperId, id);
-        setupFormSubmission(formId, id);
-        setupCollapseHandlers(cardId, wrapperId);
-        setupEditDiscardHandlers(wrapperId, formId, editorId, id, data, dropdownItems);
-        setupDeleteHandler(wrapperId, id, isPopulated);
-    }
-
-    function setupTemplateNameValidation(formId, wrapperId, id) {
-        const debouncedValidation = debounce(function (templateInput, newTitle) {
-            checkTemplateNameUnique(newTitle, id, function (isUnique) {
-                toggleTemplateNameValidation(templateInput, formId, isUnique);
-            });
-        }, 250);
-
-        $(`#${formId} input[name="templateName"]`).on('input', function () {
-            const templateInput = $(this);
-            const newTitle = templateInput.val().trim() || 'Untitled Template';
-            $(`#${wrapperId} .template-title`).text(newTitle);
-
-            debouncedValidation(templateInput, newTitle);
+        const $divider   = $('#divider');
+        const $leftPane  = $('#leftPane');
+        const $rightPane = $('#rightPane');
+        const $container = $('#splitContainer');
+
+        let isDragging     = false;
+        let dragStartX     = 0;
+        let dragStartLeft  = 0;
+
+        $divider.on('mousedown', function (e) {
+            isDragging    = true;
+            dragStartX    = e.clientX;
+            dragStartLeft = $leftPane.width();
+            $divider.addClass('dragging');
+            $('body').addClass('split-dragging');
+            e.preventDefault();
         });
-    }
 
-    function toggleTemplateNameValidation(templateInput, formId, isUnique) {
-        if (!isUnique) {
-            templateInput.addClass("is-invalid");
-            if (!$(`#${formId} .template-name-feedback`).length) {
-                templateInput.after(`<div class="invalid-feedback template-name-feedback">Template name must be unique.</div>`);
-            }
-            $(`#${formId} .saveBtn`).prop("disabled", true);
-        } else {
-            templateInput.removeClass("is-invalid");
-            $(`#${formId} .template-name-feedback`).remove();
-            $(`#${formId} .saveBtn`).prop("disabled", false);
-        }
-    }
+        $(document).on('mousemove.splitDrag', function (e) {
+            if (!isDragging) return;
 
-    function setupFormSubmission(formId, id) {
-        $(`#${formId}`).on("submit", function (e) {
-            e.preventDefault();
-            
-            const formDataArray = $(this).serializeArray();
-            const formData = extractFormData(formDataArray);
-            const editor = editorInstances[id];
-            const payload = buildTemplatePayload(formData, editor);
-
-            if (id.includes("temp")) {
-                saveTemplate(payload);
-            } else {
-                updateTemplate(id, payload);
-            }
-        });
-    }
+            const totalWidth  = $container.width();
+            const dividerW    = $divider.outerWidth();
+            const delta       = e.clientX - dragStartX;
+            let   newLeft     = dragStartLeft + delta;
+            const minLeft     = totalWidth * 0.2;
+            const maxLeft     = totalWidth * 0.8 - dividerW;
 
-    function setupCollapseHandlers(cardId, wrapperId) {
-        $(`#${cardId}`).on('show.bs.collapse', function () {
-            $(`#${wrapperId} .btn[data-bs-target="#${cardId}"] i`)
-                .removeClass('fa-chevron-down')
-                .addClass('fa-chevron-up');
-        });
+            newLeft = Math.max(minLeft, Math.min(maxLeft, newLeft));
 
-        $(`#${cardId}`).on('hide.bs.collapse', function () {
-            $(`#${wrapperId} .btn[data-bs-target="#${cardId}"] i`)
-                .removeClass('fa-chevron-up')
-                .addClass('fa-chevron-down');
-        });
-    }
+            const leftPct  = (newLeft / totalWidth * 100).toFixed(2);
+            const rightPct = ((totalWidth - newLeft - dividerW) / totalWidth * 100).toFixed(2);
 
-    function setupEditDiscardHandlers(wrapperId, formId, editorId, id, data, dropdownItems) {
-        $(`#${wrapperId}`).on("click", ".editBtn", function () {
-            handleEditClick(wrapperId, editorId, id, data, dropdownItems);
+            $leftPane.css('flex', `0 0 ${leftPct}%`);
+            $rightPane.css({ 'flex': 'none', 'width': rightPct + '%' });
         });
 
-        $(`#${wrapperId}`).on("click", ".discardBtn", function () {
-            handleDiscardClick(wrapperId, formId, editorId, id, data, dropdownItems);
+        $(document).on('mouseup.splitDrag', function () {
+            if (isDragging) {
+                isDragging = false;
+                $divider.removeClass('dragging');
+                $('body').removeClass('split-dragging');
+            }
         });
     }
 
-    function handleEditClick(wrapperId, editorId, id, data, dropdownItems) {
-        const currentEditor = editorInstances[id];
-        currentEditor.destroy();
-
-        initializeEditor(editorId, id, data, false, dropdownItems);
+    PubSub.subscribe('reload_email_attachments_table', () => {
+        reloadEmailAttachmentsTable();
+    });
 
-        const card = $(`#${wrapperId}`);
-        card.find(".form-input").prop('disabled', false);
-        card.find(".saveBtn").prop('disabled', false);
-        card.find(".discardBtn").removeClass("d-none");
-        card.find(".editBtn").addClass("d-none");
+    function reloadEmailAttachmentsTable() {
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.ajax.reload();
+        }
     }
 
-    function handleDiscardClick(wrapperId, formId, editorId, id, data, dropdownItems) {
-        const form = $(`#${formId}`)[0];
-        form.reset();
-        const currentEditor = editorInstances[id];
-        currentEditor.destroy();
-
-        initializeEditor(editorId, id, data, true, dropdownItems);
-
-        $(`#${wrapperId} .form-input`).prop('disabled', true);
-        $(`#${wrapperId} .saveBtn`).prop('disabled', true);
-        $(`#${wrapperId} .discardBtn`).addClass("d-none");
-        $(`#${wrapperId} .editBtn`).removeClass("d-none");
+    function reloadTemplatesTable() {
+        if (templatesDataTable) {
+            templatesDataTable.ajax.reload();
+        }
     }
 
-    function setupDeleteHandler(wrapperId, id, isPopulated) {
-        $(`#${wrapperId}`).on("click", ".deleteCardBtn", function () {
-            if (isPopulated) {
-                showDeleteConfirmation(id, wrapperId);
-            } else {
-                $(`#${wrapperId}`).remove();
-            }
-        });
+    function reloadTemplatesTableAndClose() {
+        if (templatesDataTable) {
+            templatesDataTable.ajax.reload();
+            closeRightPanel();
+        }
     }
 
-    function createCard(data = null) {
-        const isPopulated = data !== null;
-        const id = data?.id?.toString() || generateTempId();
-        const cardId = `collapseDetails-${id}`;
-        const formId = `form-${id}`;
-        const wrapperId = `cardWrapper-${id}`;
-        const editorId = `editor-${id}`;
-        const type = data?.type || 'Automatic';
-        const lastEdited = getCardLastEditedDate(data);
-        const dropdownItems = [];
-        
-        getTemplateVariables(dropdownItems);
-
-        const cardConfig = {
-            data: data,
-            elementIds: {
-                cardId: cardId,
-                formId: formId,
-                wrapperId: wrapperId,
-                editorId: editorId
-            },
-            displayInfo: {
-                type: type,
-                lastEdited: lastEdited
-            },
-            isPopulated: isPopulated
-        };
-
-        const cardHtml = generateCardHtml(cardConfig);
-
-        $("#cardContainer").append(cardHtml);
-        $(`#${wrapperId}`).data('original-name', data?.name || '');
+    PubSub.subscribe('reload_templates_table_no_close', () => {
+        reloadTemplatesTable();
+    });
 
-        initializeEditor(editorId, id, data, isPopulated, dropdownItems);
+    PubSub.subscribe('reload_templates_table_with_close', () => {
+        reloadTemplatesTableAndClose();
+    });
 
-        const cardData = {
-            id, formId, cardId, wrapperId, editorId, data, isPopulated, dropdownItems
-        };
-        setupCardEventHandlers(cardData);
-    }
 
-    function loadCardsFromService() {
-        $.ajax({
-            url: `/api/app/template/templates-by-tenent`,
-            type: 'GET',
-            success: handleLoadCardsSuccess,
-            error: handleLoadCardsError
-        });
-    }
-
-    function handleLoadCardsSuccess(response) {
-        editorInstances = {};
-        response.forEach(item => createCard(item));
-    }
+});
+
+function initializeEditor(data, dropdownItems) {     
+    const templateId = 'templateBody';
+    
+    // Remove existing editor instance if it exists
+    const existingEditor = tinymce.get(templateId);
+    if (existingEditor) {
+        tinymce.remove(`#${templateId}`);
+    }
+    
+    tinymce.init({
+        license_key: 'gpl',
+        selector: `#${templateId}`,
+        plugins: 'lists link image preview code',
+        toolbar: 'undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview | variablesDropdownButton',
+        resize: true,
+        statusbar: true,
+        elementpath: false,
+        branding: false,
+        promotion: false,
+        content_css: false,
+        skin: false,
+        setup: function (editor) {                
+            setupEditor(editor, templateId, templateId, data, dropdownItems);
+        }
+    });
+}
 
-    function handleLoadCardsError() {
-        abp.notify.error('Unable to load the templates.');
-    }
-    function generateTempId() {
-        const array = new Uint32Array(1);
-        window.crypto.getRandomValues(array);
-        return `temp-${array[0].toString(36)}`;
-    }
+function setupEditor(editor, id, editorId, data, dropdownItems) {
+    editor.ui.registry.addMenuButton('variablesDropdownButton', {
+        text: 'VARIABLES',
+        fetch: fetchVariablesMenuItems(dropdownItems, editor)
+    });
 
-    $("#CreateNewTemplate").on("click", function () {
-        createCard();
+    editor.on('init', function () {
+        editor.mode.set('design');
+        if (data?.bodyHTML !== undefined) {
+            editor.setContent(data.bodyHTML);
+        }    
     });
-});
\ No newline at end of file
+}    
+
+function fetchVariablesMenuItems(dropdownItems, editor) {
+    return function (callback) {
+        const items = createMenuItems(dropdownItems, editor);
+        callback(items);
+    };
+}
+
+function createMenuItems(dropdownItems, editor) {
+    return dropdownItems.map(item => ({
+        type: 'menuitem',
+        text: item.text,
+        onAction: () => {
+            editor.insertContent(`{{${item.value}}}`);
+        }
+    }));
+}
+
+/**
+ * Generates HTML for email attachment button
+ * @param {string} attachmentId - Attachment ID
+ * @returns {string} HTML for attachment button
+ */
+function generateEmailAttachmentButtonContent(attachmentId) {
+    return `<button class="btn fullWidth" style="margin:10px" type="button" onclick="deleteEmailAttachment('${attachmentId}')">
+                <i class="fl fl-cancel"></i>
+            </button>`;
+}
+
+
+/**
+ * Deletes email attachment with confirmation
+ * @param {string} attachmentId - Attachment ID to delete
+ */
+function deleteEmailAttachment(attachmentId) {
+    abp.message.confirm(
+        'Are you sure you want to delete this attachment?',
+        'Delete Attachment',
+        function (confirmed) {
+            if (confirmed) {
+                unity.notifications.emails.emailLogAttachment
+                    .delete(attachmentId)
+                    .then(function () {
+                        abp.notify.success('Attachment deleted successfully.');
+                        PubSub.publish('reload_email_attachments_table');
+                    })
+                    .catch(function (e) {
+                        console.warn('Failed to delete attachment:', e);
+                        abp.notify.error('Failed to delete attachment.');
+                    });
+            }
+        }
+    );
+}
+
+function isValidEmail(email) {
+    // Basic email validation regex
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailRegex.test(email);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
new file mode 100644
index 0000000000..12a4040364
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
@@ -0,0 +1,52 @@
+<div class="card-header editor-header py-2">
+    <div class="d-flex align-items-center gap-2 flex-wrap">                          
+        <button id="saveTemplateBtn" class="btn btn-sm btn-primary ms-auto">Save</button>                                         
+        <button id="discardTemaplateBtn" type="button" class="btn btn-outline-secondary btn-action-gray">Discard</button>
+        <button id="closeTemplateBtn" type="button" class="btn btn-sm btn-outline-secondary btn-action-gray">Close</button>
+        <button id="deleteTeamplateBtn" type="button" class="btn btn-sm btn-outline-secondary btn-action-gray btn-hidden"><i class="fl fl-cancel"></i></button>
+    </div>
+</div>
+
+<div class="card mb-3 shadow-sm">
+    <input type="hidden" id="templateId">
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="templateName" class="form-label template-field">Template Name</label>
+            <div class="flex-grow-1">
+                <input id="templateName" type="text" class="form-control form-input" name="templateName" required>
+                <div id="templateName-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="sendFrom" class="form-label template-field">Send From</label>
+            <div class="flex-grow-1">
+                <input id="sendFrom" type="text" class="form-control form-input" name="sendFrom" required>
+                <div id="sendFrom-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="subject" class="form-label template-field">Subject</label>
+            <div class="flex-grow-1">
+                <input id="subject" type="text" class="form-control form-input" name="subject" required>
+                <div id="subject-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex">
+            <label for="templateBody" class="d-none">Body</label>
+            <div class="flex-grow-1">
+                <textarea id="templateBody" required></textarea>
+                <div id="templateBody-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3 info-note">
+        <b>NOTE</b>: <span class="note-text">Selecting text will let you customize it: replace it with a
+            variable, make it bold, italic, change the alignment, add a link, create a list, etc.</span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml
new file mode 100644
index 0000000000..b60c67fdc2
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml
@@ -0,0 +1,42 @@
+<div class="container mt-3">
+
+    <abp-button id="CreateNewTemplate"
+                text="+ Add Template"
+                button-type="Primary"
+                class="mb-2 me-2 ms-auto" />
+
+
+    <div id="splitContainer" class="split-container px-3 pb-3">
+
+        <!-- Left pane: prompts table -->
+        <div id="leftPane" class="left-pane">
+            <div class="card h-100">
+                <div class="card-body p-2">
+                    <abp-table id="TemplatesTable" striped-rows="false" class="nowrap"></abp-table>
+                </div>
+            </div>
+        </div>
+
+        <!-- Drag divider (shown when a row is selected) -->
+        <div id="divider" class="split-divider" title="Drag to resize"></div>
+
+        <!-- Right pane: editor (hidden until a row is selected) -->
+        <div id="rightPane" class="right-pane" style="display:none;">
+            <div class="card h-100 d-flex flex-column">
+                <div class="card-body editor-body overflow-auto">
+                    @await Html.PartialAsync("/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml")          
+                    @await Html.PartialAsync("/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml")
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <input type="hidden" id="Extensions" value="[ &quot;exe&quot; , &quot;sh&quot; , &quot;ksh&quot; , &quot;bat&quot; , &quot;cmd&quot; ]">
+    <input type="hidden" id="MaxFileSize" value="25">
+    <input type="hidden" id="EmailAttachmentMaxFileSize" value="20">
+    <input type="hidden" id="TotalEmailAttachmentMaxFileSize" value="25">
+    <input type="hidden" id="EmailId" value="">
+
+    
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs
index db4f3d7bc6..8f384f7101 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs
@@ -229,7 +229,7 @@ private async Task ProcessTenantNotificationsAsync()
 
                 // OPTIMIZATION: Batch load all needed templates upfront instead of querying per notification (N+1 problem)
                 var uniqueTemplateIds = notifications.Select(n => n.EmailTemplateId).Distinct().ToHashSet();
-                var templatesDict = (await _templateService.GetTemplatesByTenent())
+                var templatesDict = (await _templateService.GetTemplatesByTenant())
                     .Where(t => uniqueTemplateIds.Contains(t.Id))
                     .ToDictionary(t => t.Id);
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
index f67026cfb5..70e2d1448b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
@@ -15,10 +15,10 @@ namespace Unity.GrantManager.GrantApplications;
 
 [Authorize]
 [ExposeServices(typeof(ApplicationLinksAppService), typeof(IApplicationLinksService))]
-public class ApplicationLinksAppService : CrudAppService<
+public class ApplicationLinksAppService(IRepository<ApplicationLink, Guid> repository) : CrudAppService<
         ApplicationLink,
         ApplicationLinksDto,
-        Guid>, IApplicationLinksService
+        Guid>(repository), IApplicationLinksService
 {
     // Validation Error Messages
     private const string ERROR_MULTIPLE_PARENTS = "Error: A submission can not have two parents. Please revise the link type.";
@@ -33,8 +33,6 @@ public class ApplicationLinksAppService : CrudAppService<
     public IApplicantRepository ApplicantRepository { get; set; } = null!;
     public IApplicationFormAppService ApplicationFormAppService { get; set; } = null!;
 
-    public ApplicationLinksAppService(IRepository<ApplicationLink, Guid> repository) : base(repository) { }
-
     public async Task<List<ApplicationLinksInfoDto>> GetListByApplicationAsync(Guid applicationId)
     {
         var applicationLinksQuery = await ApplicationLinksRepository.GetQueryableAsync();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs
new file mode 100644
index 0000000000..d913a3b6f2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs
@@ -0,0 +1,5227 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260624175515_AlterEmailAttachments")]
+    partial class AlterEmailAttachments
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs
new file mode 100644
index 0000000000..edcfb69943
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs
@@ -0,0 +1,98 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AlterEmailAttachments : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Make EmailLogId nullable
+            migrationBuilder.AlterColumn<Guid>(
+                name: "EmailLogId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: true,
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            // Add TemplateId
+            migrationBuilder.AddColumn<Guid>(
+                name: "TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: true);
+
+            // Optional FK - adjust schema/table as needed
+            migrationBuilder.AddForeignKey(
+                name: "FK_EmailLogAttachments_EmailTemplates_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                column: "TemplateId",
+                principalSchema: "Notifications",
+                principalTable: "EmailTemplates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EmailLogAttachments_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                column: "TemplateId");
+
+            // ARC constraint:
+            // Exactly one of EmailLogId or TemplateId must be populated.
+            migrationBuilder.AddCheckConstraint(
+                name: "CK_EmailLogAttachments_EmailLogId_XOR_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                sql: @"
+                    (
+                        (""EmailLogId"" IS NOT NULL AND ""TemplateId"" IS NULL)
+                        OR
+                        (""EmailLogId"" IS NULL AND ""TemplateId"" IS NOT NULL)
+                    )");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropCheckConstraint(
+                name: "CK_EmailLogAttachments_EmailLogId_XOR_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_EmailLogAttachments_EmailTemplates_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EmailLogAttachments_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.DropColumn(
+                name: "TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "EmailLogId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldNullable: true);
+
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
index 84e61474fa..1f6b2dbfc2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
@@ -3455,6 +3455,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("EmailLogId")
                         .HasColumnType("uuid");
 
+                    b.Property<Guid?>("TemplateId")
+                        .HasColumnType("uuid");                        
+
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs
index e0825c7dc2..d41f3c5b47 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs
@@ -1,23 +1,23 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Unity.GrantManager.Attachments;
 using Unity.GrantManager.Intakes;
+using Unity.GrantManager.Models;
 using Unity.Notifications.Emails;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Validation;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Unity.GrantManager.Models;
-using System.Threading;
 
 namespace Unity.GrantManager.Controllers
 {
@@ -57,7 +57,7 @@ public class AttachmentController : AbpController
         private readonly ICurrentTenant _currentTenant;
         private readonly ILibreOfficeConversionService _libreOfficeConversionService;
         private readonly IAttachmentPreviewAppService _attachmentPreviewAppService;
-        private ILogger logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
+        private ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
         private const string badRequestFileMsg = "File name must be provided.";
         private const string NotFoundFileMsg = "File not found.";
         private const string errorFileMsg = "An error occurred while downloading the file.";
@@ -127,7 +127,7 @@ public async Task<IActionResult> DownloadApplicantAttachment(string applicantId,
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadApplicantAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadApplicantAttachment: {ExceptionMessage}", ExceptionMessage);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -174,7 +174,7 @@ public async Task<IActionResult> DownloadApplicationAttachment(string applicatio
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadApplicationAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadApplicationAttachment: {ExceptionMessage}", ExceptionMessage);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -221,7 +221,7 @@ public async Task<IActionResult> DownloadAssessmentAttachment(string assessmentI
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadAssessmentAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadAssessmentAttachment: {ExceptionMessage}", ExceptionMessage);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -253,7 +253,7 @@ public async Task<IActionResult> DownloadChefsAttachment(Guid formSubmissionId,
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadChefsAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadChefsAttachment: {ExceptionMessage}", ExceptionMessage);
                 var errorCode = ex.Data.Contains(ErrorCodeKey) ? Convert.ToInt32(ex.Data[ErrorCodeKey]) : 500;
                 return StatusCode(errorCode, ExceptionMessage);
             }
@@ -297,7 +297,7 @@ public async Task<IActionResult> DownloadAllChefsAttachment([FromBody] List<Atta
                 catch (Exception ex)
                 {
                     string ExceptionMessage = ex.Message;
-                    logger.LogError(ex, "AttachmentController->DownloadAllChefsAttachment: {ExceptionMessage}", ExceptionMessage);
+                    Logger.LogError(ex, "AttachmentController->DownloadAllChefsAttachment: {ExceptionMessage}", ExceptionMessage);
                     if (ExceptionMessage.Contains(chefsApiAccessError))
                     {                        
                         return StatusCode(403, chefsApiAccessError);
@@ -325,7 +325,7 @@ public async Task<IActionResult> PreviewApplicationAttachment(string application
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewApplicationAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewApplicationAttachment: {Message}", ex.Message);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -346,7 +346,7 @@ public async Task<IActionResult> PreviewAssessmentAttachment(string assessmentId
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewAssessmentAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewAssessmentAttachment: {Message}", ex.Message);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -366,7 +366,7 @@ public async Task<IActionResult> PreviewApplicantAttachment(string applicantId,
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewApplicantAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewApplicantAttachment: {Message}", ex.Message);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -387,7 +387,7 @@ public async Task<IActionResult> PreviewChefsAttachment(Guid formSubmissionId, G
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewChefsAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewChefsAttachment: {Message}", ex.Message);
                 var errorCode = ex.Data.Contains(ErrorCodeKey) ? Convert.ToInt32(ex.Data[ErrorCodeKey]) : 500;
                 return StatusCode(errorCode, errorFileMsg);
             }
@@ -447,9 +447,20 @@ public async Task<IActionResult> UploadApplicationAttachments(Guid applicationId
             return await UploadFiles(files);
         }
 
+        [HttpPost("template/{templateId}/upload")]
+        public async Task<IActionResult> UploadTemplateAttachments(Guid templateId, IList<IFormFile> files)
+        {
+            return await UploadEmailAttachments(null, templateId, files);
+        }
+
         [HttpPost("email/{emailLogId}/upload")]
         public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<IFormFile> files)
         {
+            return await UploadEmailAttachments(emailLogId, null, files);
+        }
+
+        public async Task<IActionResult> UploadEmailAttachments(Guid? emailLogId, Guid? templateId, IList<IFormFile> files)
+        { 
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
@@ -481,9 +492,9 @@ public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<I
 
             var totalMaxFileSizeConfig = _configuration["S3:EmailAttachmentsTotalMaxFileSize"] ?? "25";
             if (double.TryParse(totalMaxFileSizeConfig, out double totalMaxSizeMB))
-            {
+            {                
                 long existingTotalBytes = await _emailLogAttachmentUploadService
-                    .GetTotalFileSizeByEmailLogIdAsync(emailLogId);
+                    .GetTotalFileSizeByEmailLogIdAsync(emailLogId, templateId);
                 long newFilesBytes = files.Sum(f => f.Length);
                 double combinedMB = (existingTotalBytes + newFilesBytes) * 0.000001;
 
@@ -504,6 +515,7 @@ public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<I
                     await file.CopyToAsync(ms);
                     var dto = await _emailLogAttachmentUploadService.UploadAsync(
                         emailLogId,
+                        templateId,
                         _currentTenant.Id,
                         file.FileName,
                         ms.ToArray(),
@@ -512,7 +524,7 @@ public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<I
                 }
                 catch (Exception ex)
                 {
-                    logger.LogError(ex, "AttachmentController->UploadEmailAttachments: Failed to upload {FileName}", file.FileName);
+                    Logger.LogError(ex, "AttachmentController->UploadEmailAttachments: Failed to upload {FileName}", file.FileName);
                     return StatusCode(500, $"Failed to upload {file.FileName}: {ex.Message}");
                 }
             }
@@ -527,7 +539,7 @@ private async Task<IActionResult> UploadFiles(IList<IFormFile> files)
             {
                 throw new AbpValidationException(message: "ERROR: Invalid File Type.", validationErrors: InvalidFileTypes);
             }
-            List<string> ErrorList = new();
+            List<string> ErrorList = [];
             foreach (IFormFile source in files)
             {
                 try
@@ -558,7 +570,7 @@ await _fileAppService.SaveBlobAsync(
 
         private List<ValidationResult> GetInvalidFileTypes(IList<IFormFile> files)
         {
-            List<ValidationResult> ErrorList = new();
+            List<ValidationResult> ErrorList = [];
             var InvalidFileTypes = _configuration["S3:DisallowedFileTypes"] ?? "";
             var DisallowedFileTypes = JsonConvert.DeserializeObject<string[]>(InvalidFileTypes);
             if (DisallowedFileTypes == null)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
index 00fb2e9756..71823c6d0c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
@@ -30,7 +30,7 @@ public FormNotificationsApiController(IApplicationStatusService statusService, I
         [HttpGet("templates")]
         public async Task<ActionResult<List<EmailTemplateDto>>> GetTemplates()
         {
-            var templates = await _templateService.GetTemplatesByTenent();
+            var templates = await _templateService.GetTemplatesByTenant();
             var list = templates.Select(t => new EmailTemplateDto
             {
                 Id = t.Id,
@@ -181,6 +181,26 @@ public async Task<IActionResult> CancelNotification(string formId, Guid id)
             return NoContent();
         }
 
+        [HttpGet("can-delete-template/{templateId:guid}")]
+        public async Task<ActionResult<object>> CanDeleteTemplate(Guid templateId)
+        {
+            var result = await _automatedNotificationAppService.GetListAsync(
+                new Notifications.GetNotificationsInput { MaxResultCount = 1000 });
+
+            var inUse = result.Items.Any(n => n.EmailTemplateId == templateId);
+
+            if (inUse)
+            {
+                return Ok(new
+                {
+                    canDelete = false,
+                    errorMessage = "This template cannot be deleted because it is assigned to one or more Scheduled Notifications. Please remove the template from all Scheduled Notifications before deleting."
+                });
+            }
+
+            return Ok(new { canDelete = true, errorMessage = (string?)null });
+        }
+
         [HttpPut("{formId}/{id:guid}")]
         public async Task<ActionResult<ScheduledNotificationDto>> UpdateForForm(string formId, Guid id, [FromBody] CreateScheduledNotificationInput input)
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
index feb81c616c..bfc372b165 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
@@ -107,10 +107,6 @@
                 <input type="hidden" id="AccountCodingId" value="@Model.AccountCodingId" />
 
                 <div class="container-fluid px-0">
-                    <div class="unity-page-titlebar">
-                        <h4 class="m-0">Payments</h4>
-                    </div>
-
                     <nav aria-label="Payment Tabs">
                         <div class="nav nav-tabs" id="payments-nav-tab" role="tablist">
                             @if (Model.ShowPaymentAccountCoding)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css
index 401a5713e3..7b5cb6e6b2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css
@@ -40,9 +40,8 @@
 
 .config-management {
     padding: 1rem;
-    max-height: calc(100vh - 140px);
     overflow: hidden;
-    margin-top: 20px;
+    margin-top: 10px;
     width: 95%;
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
index f17597dc1a..2782637ef8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
@@ -2,6 +2,7 @@
     const menuItems = $('#ConfigurationManagementSideMenu .nav-item');
     const configSections = $('.config-section');
     const ACTIVE_MENU_KEY = 'ConfigurationManagement_ActiveMenu';
+    const ACTIVE_PAYMENTS_TAB_KEY = 'payments-active-tab';
 
     init();
 
@@ -11,6 +12,10 @@
         // Adjust DataTables when Payments internal tabs are shown
         $('button[data-bs-toggle="tab"]').on('shown.bs.tab', function () {
             adjustDataTables();
+            // Save active payments tab
+            if ($(this).closest('#payments-nav-tab').length) {
+                localStorage.setItem(ACTIVE_PAYMENTS_TAB_KEY, this.id);
+            }
         });
 
         // Restore the last active menu item from localStorage, fallback to first
@@ -23,14 +28,18 @@
             $('#' + targetId).removeClass('hide');
         }
 
-        // Auto-activate the first Payment tab (if rendered)
-        const firstPaymentTab = $('#payments-nav-tab .nav-link').first();
-        if (firstPaymentTab.length) {
-            firstPaymentTab.addClass('active');
-            const targetPane = $(firstPaymentTab.data('bs-target'));
-            if (targetPane.length) {
-                targetPane.addClass('show active');
-            }
+        // Auto-activate saved Payment tab or first tab
+        const savedPaymentTabId = localStorage.getItem(ACTIVE_PAYMENTS_TAB_KEY);
+        const paymentTabContainer = $('#payments-nav-tab');
+        let paymentTabToActivate = paymentTabContainer.find(`#${savedPaymentTabId}`);
+        
+        if (!paymentTabToActivate.length) {
+            paymentTabToActivate = paymentTabContainer.find('.nav-link').first();
+        }
+        
+        if (paymentTabToActivate.length) {
+            const tab = new bootstrap.Tab(paymentTabToActivate[0]);
+            tab.show();
         }
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index cbb04e1c07..5afa3e37fc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -198,40 +198,8 @@
             </abp-row>
         </fieldset>
 
-        <div id="email-attachments-section" class="px-3" style="display:none">
-            <abp-row class="m-0 p-0">
-                <abp-column size="_12" class="px-0">
-                    <h6 class="fw-bold pt-3 pb-1 m-0">Attachments</h6>
-                    <abp-table id="EmailAttachmentsTable"
-                               hoverable-rows="true"
-                               class="attachments-table nowrap"></abp-table>
-                    <div id="attachment-upload-progress" style="display:none" class="mt-2 mb-1">
-                        <div class="progress">
-                            <progress id="attachment-upload-progress-bar"
-                                 class="progress-bar progress-bar-striped progress-bar-animated"
-                                 style="width:0%"
-                                 value="0"
-                                 max="100">0%</progress>
-                        </div>
-                    </div>
-                    <div id="email-attachment-size-error" class="alert alert-danger mt-2" style="display:none">
-                        <i class="fa fa-exclamation-triangle me-1"></i>
-                        <span id="email-attachment-size-error-message"></span>
-                    </div>
-                    <div class="d-flex justify-content-end mt-2 mb-1">
-                        <form id="email-attachment-form" enctype="multipart/form-data">
-                            <input id="email_attachment_upload" type="file" multiple
-                                   style="display:none" />
-                            <abp-button text="Add Attachments"
-                                        id="email_attachment_upload_btn"
-                                        icon-type="Other"
-                                        icon="fl fl-plus"
-                                        button-type="Light" />
-                        </form>
-                    </div>
-                </abp-column>
-            </abp-row>
-        </div>
+        @await Html.PartialAsync("/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml")
+
     </form>
 
 <!-- Schedule Send Modal -->
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index f60c1fd0f3..2634aa9f79 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -1873,18 +1873,9 @@ function deleteEmailAttachment(attachmentId) {
  * @returns {string} HTML for attachment button
  */
 function generateEmailAttachmentButtonContent(attachmentId) {
-    return `
-        <div class="dropdown" style="float:right;">
-            <button class="btn btn-light dropbtn" type="button">
-                <i class="fl fl-attachment-more"></i>
-            </button>
-            <div class="dropdown-content">
-                <button class="btn fullWidth" style="margin:10px" type="button"
-                        onclick="deleteEmailAttachment('${attachmentId}')">
-                    <i class="fl fl-cancel"></i><span>Delete Attachment</span>
-                </button>
-            </div>
-        </div>`;
+    return `<button class="btn fullWidth" style="margin:10px" type="button" onclick="deleteEmailAttachment('${attachmentId}')">
+                <i class="fl fl-cancel"></i>
+            </button>`;
 }
 
 /**
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
index 9beb79b57d..76fab2f882 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
@@ -45,7 +45,7 @@ await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.EnableEmailDe
         }
         private async Task PopulateTemplates(EmailsWidgetViewModel model)
         {
-            var templates = await templateService.GetTemplatesByTenent();
+            var templates = await templateService.GetTemplatesByTenant();
 
             templates.ForEach(t =>
            {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml
new file mode 100644
index 0000000000..95d6a5f267
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml
@@ -0,0 +1,34 @@
+<div id="email-attachments-section" class="px-3" style="display:none">
+    <abp-row class="m-0 p-0">
+        <abp-column size="_12" class="px-0">
+            <h6 class="fw-bold pt-3 pb-1 m-0">Attachments</h6>
+            <abp-table id="EmailAttachmentsTable"
+                        hoverable-rows="true"
+                        class="attachments-table nowrap"></abp-table>
+            <div id="attachment-upload-progress" style="display:none" class="mt-2 mb-1">
+                <div class="progress">
+                    <progress id="attachment-upload-progress-bar"
+                            class="progress-bar progress-bar-striped progress-bar-animated"
+                            style="width:0%"
+                            value="0"
+                            max="100">0%</progress>
+                </div>
+            </div>
+            <div id="email-attachment-size-error" class="alert alert-danger mt-2" style="display:none">
+                <i class="fa fa-exclamation-triangle me-1"></i>
+                <span id="email-attachment-size-error-message"></span>
+            </div>
+            <div class="d-flex justify-content-end mt-2 mb-1">
+                <form id="email-attachment-form" enctype="multipart/form-data">
+                    <label for="email_attachment_upload" style="display:none">Email Attachment Upload</label>
+                    <input id="email_attachment_upload" type="file" multiple style="display:none"/>
+                    <abp-button text="Add Attachments"
+                                id="email_attachment_upload_btn"
+                                icon-type="Other"
+                                icon="fl fl-plus"
+                                button-type="Light" />
+                </form>
+            </div>
+        </abp-column>
+    </abp-row>
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
index 4adaadf115..6f5536e946 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
@@ -148,17 +148,19 @@
     }
 
     function renderTriggerDetail(data, type, row) {
+        let detail = '';
         if (row.triggerType === 'Date') {
-            let detail = row.dateType ? row.dateType : '';
-            if (row.recipientCategory) {
-                detail += (detail ? ' → ' : '') + 'Category: ' + row.recipientCategory;
-            }
-            if (row.recipientIdentifier) {
-                detail += (detail ? ', ' : '') + 'Recipients: ' + row.recipientIdentifier;
-            }
-            return detail;
+            detail = row.dateType ? row.dateType : '';
+        } else {
+            detail = row.eventStatus ? row.eventStatus : '';
+        }
+        if (row.recipientCategory) {
+            detail += (detail ? ' → ' : '') + 'Category: ' + row.recipientCategory;
+        }
+        if (row.recipientIdentifier) {
+            detail += (detail ? ', ' : '') + 'Recipients: ' + row.recipientIdentifier;
         }
-        return row.eventStatus ? row.eventStatus : '';
+        return detail;
     }
 
     function getNotificationColumns() {

From 3129b0eb6517ac67d3c8d7bd624041ca49a984d7 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Tue, 7 Jul 2026 10:39:01 -0700
Subject: [PATCH 2/9] AB#33751 dbmigrator configuration

---
 applications/Unity.GrantManager/.dockerignore | 13 ++++++
 .../Unity.GrantManager.DbMigrator/README.md   | 40 +++++++++----------
 .../Unity.GrantManager.DbMigrator.csproj      |  7 ++--
 .../appsettings.json                          |  2 +-
 4 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 applications/Unity.GrantManager/.dockerignore

diff --git a/applications/Unity.GrantManager/.dockerignore b/applications/Unity.GrantManager/.dockerignore
new file mode 100644
index 0000000000..cdff4d3b43
--- /dev/null
+++ b/applications/Unity.GrantManager/.dockerignore
@@ -0,0 +1,13 @@
+# Local secrets must never end up in a Docker build context / image,
+# even for a locally-run `docker build` outside of CI (which never has
+# these files in the first place, since they are gitignored).
+**/appsettings.secrets.json
+**/appsettings.Development.json
+
+# Build artifacts and local tooling state - not needed in the build
+# context and only bloat it / risk copying stale output.
+**/bin/
+**/obj/
+**/node_modules/
+.git/
+.vs/
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
index 909ce676f5..fb087c9535 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
@@ -6,43 +6,41 @@ This project is responsible for running database migrations for the Unity Grant
 
 The `appsettings.json` file in this project intentionally excludes sensitive information like database passwords to comply with security best practices and avoid SonarQube or Copilot warnings about checking credentials into source control.
 
-### Option 1: Using appsettings.Development.json (Recommended for Local Development)
+### appsettings.secrets.json (used by this project)
 
-Create an `appsettings.Development.json` file in the DbMigrator project directory with your connection strings including passwords:
+`Program.cs` wires configuration up with:
 
-```json
-{
-  "ConnectionStrings": {    
-    "Default": "Host=localhost;port=5432;Database=UnityGrantManager;Username=postgres;Password=your_password_here",
-    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;Password=your_password_here"
-  }
-}
+```csharp
+Host.CreateDefaultBuilder(args)
+    .AddAppSettingsSecretsJson()
+    ...
 ```
 
-**Note:** This file is excluded from git via `.gitignore` to keep your credentials secure.
+`AddAppSettingsSecretsJson()` is a helper from the ABP Framework (`Volo.Abp.Core`) that adds an **optional** `appsettings.secrets.json` file to the configuration pipeline. Because it's chained onto the host builder after `Host.CreateDefaultBuilder` has already added its default sources, it loads *after* environment variables and command-line arguments — so any value it defines will override an environment variable of the same key. This is the supported way to layer local secrets on top of whatever environment configuration is already in place.
 
-### Option 2: Using User Secrets
-
-Alternatively, you can use .NET User Secrets to store sensitive configuration:
-
-1. Right-click on the `Unity.GrantManager.DbMigrator` project in Visual Studio
-2. Select "Manage User Secrets"
-3. Add your connection strings with passwords:
+Create an `appsettings.secrets.json` file in this project directory with your local connection strings and any other overrides:
 
 ```json
 {
-  "ConnectionStrings": {    
+  "ConnectionStrings": {
     "Default": "Host=localhost;port=5432;Database=UnityGrantManager;Username=postgres;Password=your_password_here",
-    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;Password=your_password_here"
+    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;Password=your_password_here",
+    "Onboarding": "Host=localhost;port=5432;Database=UnityOnboarding;Username=postgres;Password=your_password_here"
   }
 }
 ```
 
-User secrets are stored outside of your project directory and are never checked into source control.
+**Note:** This file is excluded from git via the root [`.gitignore`](../../../../.gitignore) (`/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.secrets.json`), so your local credentials are never committed. The `Unity.GrantManager.Web` project uses the same mechanism and has its own gitignore entry for its own `appsettings.secrets.json`.
+
+Because the file is optional, its absence is not an error — omit it entirely if you're configuring everything through environment variables instead.
+
+### Production / CI builds
+
+`appsettings.secrets.json` is **not** referenced anywhere in `Unity.GrantManager.DbMigrator.csproj` (unlike `appsettings.json`, which is explicitly included with `CopyToOutputDirectory`), so even if the file exists on a machine building this project, it is not copied into the build or publish output. Combined with the file being gitignored — meaning a fresh CI checkout never has it on disk in the first place — there's no path for local secrets to leak into a DbMigrator build or the resulting Docker image.
 
 ## Running the Migrator
 
-Once you've configured your connection strings using either option above, you can run the migrator:
+Once you've configured your connection strings via `appsettings.secrets.json` (or environment variables), you can run the migrator:
 
 ```bash
 dotnet run
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
index 3d3f0566cf..d32bc24a54 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>    
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,8 +13,7 @@
     <Content Include="appsettings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Remove="appsettings.secrets.json" />
+    </Content>    
   </ItemGroup>
 
   <ItemGroup>    
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json
index 2d97676b33..1e36d565d5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json
@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "Default": "Host=localhost;port=5432;Database=UnityGrantManager;Username=postgres;",
     "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;",
-    "Onboarding": "Host=localhost;port=5432;Database=Onboarding;Username=postgres;"
+    "Onboarding": "Host=localhost;port=5432;Database=UnityOnboarding;Username=postgres;"
   },
   "StringEncryption": {
     "DefaultPassPhrase": "g2IuZx7PwXDvCmlW"

From 223f29d0d1b3462ac95baa0f14ae6ad4406e5d03 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <98196495+AndreGAot@users.noreply.github.com>
Date: Tue, 7 Jul 2026 13:03:21 -0700
Subject: [PATCH 3/9] Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 applications/Unity.GrantManager/.dockerignore               | 3 +++
 .../src/Unity.GrantManager.DbMigrator/README.md             | 3 ++-
 .../Unity.GrantManager.DbMigrator.csproj                    | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/applications/Unity.GrantManager/.dockerignore b/applications/Unity.GrantManager/.dockerignore
index cdff4d3b43..c73fffa5e9 100644
--- a/applications/Unity.GrantManager/.dockerignore
+++ b/applications/Unity.GrantManager/.dockerignore
@@ -3,6 +3,9 @@
 # these files in the first place, since they are gitignored).
 **/appsettings.secrets.json
 **/appsettings.Development.json
+**/.env
+**/.env.*
+**/*.env
 
 # Build artifacts and local tooling state - not needed in the build
 # context and only bloat it / risk copying stale output.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
index fb087c9535..21a27a7214 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
@@ -16,7 +16,8 @@ Host.CreateDefaultBuilder(args)
     ...
 ```
 
-`AddAppSettingsSecretsJson()` is a helper from the ABP Framework (`Volo.Abp.Core`) that adds an **optional** `appsettings.secrets.json` file to the configuration pipeline. Because it's chained onto the host builder after `Host.CreateDefaultBuilder` has already added its default sources, it loads *after* environment variables and command-line arguments — so any value it defines will override an environment variable of the same key. This is the supported way to layer local secrets on top of whatever environment configuration is already in place.
+`AddAppSettingsSecretsJson()` is a helper from the ABP Framework (`Volo.Abp.Core`) that adds an **optional** `appsettings.secrets.json` file to the configuration pipeline. Because it's chained onto the host builder after `Host.CreateDefaultBuilder` has already added its default sources, it loads *after* those sources (including environment variables and command-line arguments).
+As a result, any value it defines will override values from earlier providers (including env vars and command-line) when the keys match.
 
 Create an `appsettings.secrets.json` file in this project directory with your local connection strings and any other overrides:
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
index d32bc24a54..8ade8482cb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>    
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,10 +13,10 @@
     <Content Include="appsettings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>    
+    </Content>
   </ItemGroup>
 
-  <ItemGroup>    
+  <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From f9ea0255c5fd60a95c6d16bd5d1e0ae89a3cbd8a Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Tue, 7 Jul 2026 14:19:41 -0700
Subject: [PATCH 4/9] AB#33515: Exclude Child Application In Total Approved
 Amount

---
 .../Payments/ApplicantPaymentsAppService.cs   |   4 +-
 .../ApplicantPaymentsAppServiceTests.cs       | 191 ++++++++++++++++++
 2 files changed, 194 insertions(+), 1 deletion(-)
 create mode 100644 applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs
index 600d4df4b2..159192fb42 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs
@@ -23,7 +23,9 @@ public class ApplicantPaymentsAppService(
     public async Task<ApplicantPaymentSummaryDto> GetPaymentSummaryByApplicantIdAsync(Guid applicantId)
     {
         var applications = await applicationRepository.GetByApplicantIdAsync(applicantId);
-        var totalApproved = applications.Sum(a => a.ApprovedAmount);
+        var totalApproved = applications
+            .Where(a => a.ApplicationLinks == null || !a.ApplicationLinks.Any(l => l.LinkType == ApplicationLinkType.Parent))
+            .Sum(a => a.ApprovedAmount);
 
         if (applications.Count == 0)
             return new ApplicantPaymentSummaryDto { TotalApprovedAmount = totalApproved };
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs
new file mode 100644
index 0000000000..9003ccf05d
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs
@@ -0,0 +1,191 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.Payments.Enums;
+using Unity.Payments.PaymentRequests;
+using Volo.Abp.Domain.Entities;
+using Xunit;
+
+namespace Unity.GrantManager.ApplicantProfile
+{
+    public class ApplicantPaymentsAppServiceTests
+    {
+        private readonly IApplicationRepository _applicationRepository;
+        private readonly IPaymentRequestAppService _paymentRequestAppService;
+        private readonly ApplicantPaymentsAppService _service;
+
+        public ApplicantPaymentsAppServiceTests()
+        {
+            _applicationRepository = Substitute.For<IApplicationRepository>();
+            _paymentRequestAppService = Substitute.For<IPaymentRequestAppService>();
+
+            _service = new ApplicantPaymentsAppService(
+                _applicationRepository,
+                _paymentRequestAppService);
+
+            _paymentRequestAppService
+                .GetListByApplicationIdsAsync(Arg.Any<List<Guid>>())
+                .Returns([]);
+        }
+
+        private static Application CreateApplication(decimal approvedAmount, Collection<ApplicationLink>? links = null)
+        {
+            var application = new Application
+            {
+                ApprovedAmount = approvedAmount,
+                ApplicationLinks = links
+            };
+            EntityHelper.TrySetId(application, () => Guid.NewGuid());
+            return application;
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithNoLinks_ShouldSumAllApplications()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            var applications = new List<Application>
+            {
+                CreateApplication(1000m),
+                CreateApplication(500m)
+            };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1500m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_ShouldExcludeChildApplications_FromTotalApprovedAmount()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            var parentApplication = CreateApplication(1000m);
+            var childApplication = CreateApplication(400m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = parentApplication.Id,
+                    LinkType = ApplicationLinkType.Parent
+                }
+            ]);
+            var applications = new List<Application> { parentApplication, childApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1000m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithChildTypeLink_ShouldNotExcludeParentApplication()
+        {
+            // Arrange
+            // A "Child"-type link on an application's own ApplicationLinks means the linked
+            // application is ITS child - i.e. this application is the parent, and should still
+            // be included in the total.
+            var applicantId = Guid.NewGuid();
+            var parentApplication = CreateApplication(1000m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = Guid.NewGuid(),
+                    LinkType = ApplicationLinkType.Child
+                }
+            ]);
+            var applications = new List<Application> { parentApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1000m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithRelatedTypeLink_ShouldNotExcludeApplication()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            var relatedApplication = CreateApplication(750m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = Guid.NewGuid(),
+                    LinkType = ApplicationLinkType.Related
+                }
+            ]);
+            var applications = new List<Application> { relatedApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(750m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_ShouldStillIncludePaymentsForChildApplications_InTotalPaidAmount()
+        {
+            // Arrange: TotalPaidAmount/TotalRemainingAmount are unaffected by the child-exclusion
+            // change - they remain based on payments across all applications, including children.
+            var applicantId = Guid.NewGuid();
+            var parentApplication = CreateApplication(1000m);
+            var childApplication = CreateApplication(400m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = parentApplication.Id,
+                    LinkType = ApplicationLinkType.Parent
+                }
+            ]);
+            var applications = new List<Application> { parentApplication, childApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            _paymentRequestAppService
+                .GetListByApplicationIdsAsync(Arg.Any<List<Guid>>())
+                .Returns(
+                [
+                    new PaymentDetailsDto
+                    {
+                        CorrelationId = childApplication.Id,
+                        Amount = 400m,
+                        Status = PaymentRequestStatus.HistoricalPayment
+                    }
+                ]);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1000m);
+            result.TotalPaidAmount.ShouldBe(400m);
+            result.TotalRemainingAmount.ShouldBe(600m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithNoApplications_ShouldReturnZeroApproved()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns([]);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(0m);
+        }
+    }
+}

From 5afb4e3c06ee74bb82afc099af5123c1dc225912 Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Tue, 7 Jul 2026 16:21:33 -0700
Subject: [PATCH 5/9] feature/AB#32580-TemplateAttachments

---
 .../Templates/EmailTempateDto.cs              |    2 +
 .../EmailNotificationManager.cs               |   43 +-
 .../Emails/EmailLogAttachmentAppService.cs    |   26 +-
 .../Templates/TemplatesService.cs             |    7 +-
 .../Emails/EmailLogAttachment.cs              |    3 +
 .../Emails/IEmailLogAttachmentRepository.cs   |    1 +
 .../Templates/EmailTemplate.cs                |    8 +-
 .../EmailLogAttachmentRepository.cs           |    6 +
 .../NotificationsSettingGroup/Default.css     |  159 ++-
 .../NotificationsSettingGroup/Default.js      |  234 +++-
 .../NotificationsSettingViewComponent.cs      |    7 +
 .../_TemplateDetails.cshtml                   |   23 +
 .../Events/ScheduledNotificationHelper.cs     |   67 +-
 .../ApplicationLinksAppService.cs             |   12 +-
 ...cipientColumnsToEmailTemplates.Designer.cs |  118 ++
 ...000_AddRecipientColumnsToEmailTemplates.cs |   55 +
 .../FormNotificationsApiController.cs         |  172 ++-
 .../Pages/ConfigurationManagement/Index.js    |   21 +-
 .../FormConfiguration/Notifications.cshtml    |    3 +-
 .../Components/EmailHistoryWidget/Default.js  |   80 +-
 .../Components/EmailsWidget/Default.cshtml    |   22 +-
 .../Components/EmailsWidget/Default.css       |  215 +++-
 .../Shared/Components/EmailsWidget/Default.js | 1017 +++++++++++++++--
 .../Components/Notifications/Default.cshtml   |    2 +-
 .../Components/Notifications/Default.js       |   85 +-
 .../Components/Notifications/Notifications.js |    2 +-
 .../js/formConfiguration/Notifications.js     |    2 +-
 .../formConfiguration/NotificationsPreview.js |   89 ++
 28 files changed, 2240 insertions(+), 241 deletions(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs
index 8f791b756f..17d90ab9bf 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs
@@ -13,5 +13,7 @@ public class EmailTempateDto
         public string BodyText { get; set; } = "";
         public string BodyHTML { get; set; } = "";
         public string SendFrom { get; set; } = "";
+        public string? RecipientCategory { get; set; }
+        public string? RecipientIdentifier { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs
index 75b5907e65..9918622401 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs
@@ -15,6 +15,7 @@
 using Unity.Notifications.Integrations.RabbitMQ;
 using Unity.Notifications.Settings;
 using Volo.Abp;
+using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.Settings;
@@ -31,6 +32,8 @@ public class EmailNotificationManager(
         EmailAttachmentService emailAttachmentService,
         ISettingProvider settingProvider) : DomainService, IEmailNotificationManager
     {
+        private static readonly TimeSpan BcPermanentDstOffset = TimeSpan.FromHours(-7);
+
         public async Task<EmailLog?> CreateEmailLogAsync(EmailMessageParams email, Guid applicationId)
         {
             return await CreateEmailLogAsync(email, applicationId, EmailStatus.Initialized);
@@ -114,7 +117,22 @@ public async Task DeleteEmailLogAsync(Guid id)
             }
 
             await DeleteEmailAttachmentsAsync(id);
-            await emailLogsRepository.DeleteAsync(id);
+            
+            try
+            {
+                await emailLogsRepository.DeleteAsync(id);
+            }
+            catch (AbpDbConcurrencyException)
+            {
+                // Handle concurrency exception - entity may have been deleted by another request
+                // Try to get fresh entity and delete it, or silently succeed if it's already gone
+                var freshEmailLog = await emailLogsRepository.FindAsync(id);
+                if (freshEmailLog != null)
+                {
+                    await emailLogsRepository.DeleteAsync(freshEmailLog, autoSave: true);
+                }
+                // If entity doesn't exist, that's fine - it was already deleted
+            }
         }
 
         public async Task CancelEmailLogAsync(Guid id)
@@ -276,7 +294,8 @@ protected virtual async Task<dynamic> GetEmailObjectAsync(
             // delayTS: desired UTC send time as Unix milliseconds; 0 = send immediately.
             if (email.SendOnDateTime.HasValue)
             {
-                emailObjectDictionary["delayTS"] = new DateTimeOffset(email.SendOnDateTime.Value, TimeSpan.Zero).ToUnixTimeMilliseconds();
+                var normalizedUtcSendOn = NormalizeToUtc(email.SendOnDateTime.Value);
+                emailObjectDictionary["delayTS"] = new DateTimeOffset(normalizedUtcSendOn).ToUnixTimeMilliseconds();
             }
 
             // templateName is not part of the CHES MessageObject schema
@@ -289,6 +308,16 @@ protected virtual async Task<dynamic> GetEmailObjectAsync(
             return emailObject;
         }
 
+        private static DateTime NormalizeToUtc(DateTime sendOnDateTime)
+        {
+            return sendOnDateTime.Kind switch
+            {
+                DateTimeKind.Utc => sendOnDateTime,
+                DateTimeKind.Local => sendOnDateTime.ToUniversalTime(),
+                _ => new DateTimeOffset(sendOnDateTime, BcPermanentDstOffset).UtcDateTime
+            };
+        }
+
         protected virtual EmailLog UpdateMappedEmailLog(EmailLog emailLog, dynamic emailDynamicObject)
         {
             var dict = (IDictionary<string, object?>)emailDynamicObject;
@@ -331,9 +360,13 @@ private async Task<EmailLog> PopulateEmailLogAsync(
             {
                 emailLog.ScheduledNotificationId = scheduledNotificationId.Value;
             }
-            emailLog.SendOnDateTime = email.SendOnDateTime;
-            emailLog.Status = DetermineSendStatus(email.SendOnDateTime, status);
-            emailLog.EmailType = DetermineEmailType(email.SendOnDateTime);
+            var normalizedSendOnDateTime = email.SendOnDateTime.HasValue
+                ? NormalizeToUtc(email.SendOnDateTime.Value)
+                : (DateTime?)null;
+
+            emailLog.SendOnDateTime = normalizedSendOnDateTime;
+            emailLog.Status = DetermineSendStatus(normalizedSendOnDateTime, status);
+            emailLog.EmailType = DetermineEmailType(normalizedSendOnDateTime);
             return emailLog;
         }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
index e69f253077..1933d5e6da 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
@@ -8,6 +8,7 @@
 using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.Users;
 
 namespace Unity.Notifications.Emails;
@@ -65,17 +66,24 @@ public async Task<List<EmailLogAttachmentDto>> GetListBydAsync(Guid? emailLogId,
 
     public async Task DeleteAsync(Guid id)
     {
-        var attachment = await emailLogAttachmentRepository.GetAsync(id);
-
+        // Idempotent delete: if already removed by another request, treat as success.
+        var attachment = await emailLogAttachmentRepository.FindAsync(id);
         if (attachment == null)
         {
-            throw new UserFriendlyException("Attachment not found.");
+            return;
         }
 
         if (attachment.TemplateId.HasValue)
         {
             await emailAttachmentService.DeleteFromS3Async(attachment.S3ObjectKey);
-            await emailLogAttachmentRepository.DeleteAsync(id);
+            try
+            {
+                await emailLogAttachmentRepository.DeleteAsync(attachment, autoSave: true);
+            }
+            catch (EntityNotFoundException)
+            {
+                // Already deleted by another request.
+            }
             return;
         }
 
@@ -98,7 +106,15 @@ public async Task DeleteAsync(Guid id)
         {
             Logger.LogError(ex, "Failed to delete S3 object {S3ObjectKey} for attachment {AttachmentId}", attachment.S3ObjectKey, id);
         }
-        await emailLogAttachmentRepository.DeleteAsync(id);
+
+        try
+        {
+            await emailLogAttachmentRepository.DeleteAsync(attachment, autoSave: true);
+        }
+        catch (EntityNotFoundException)
+        {
+            // Already deleted by another request.
+        }
     }
 
     public async Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid? emailLogId, Guid? templateId)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
index cdf6a6b354..2744d05d67 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
@@ -40,7 +40,10 @@ ITemplateVariablesRepository templateVariablesRepository
             templateDto.Description,
             templateDto.Subject,
             templateDto.BodyText,
-            templateDto.BodyHTML, templateDto.SendFrom));
+            templateDto.BodyHTML,
+            templateDto.SendFrom,
+            templateDto.RecipientCategory,
+            templateDto.RecipientIdentifier));
     }
 
     public async Task<EmailTemplate?> UpdateTemplate(Guid id, EmailTempateDto templateDto)
@@ -54,6 +57,8 @@ ITemplateVariablesRepository templateVariablesRepository
         template.BodyHTML = templateDto.BodyHTML != null ? templateDto.BodyHTML : "";
         template.Name = templateDto.Name;
         template.SendFrom = templateDto.SendFrom;
+        template.RecipientCategory = templateDto.RecipientCategory;
+        template.RecipientIdentifier = templateDto.RecipientIdentifier;
 
         // When being called here the current tenant is in context - verified by looking at the tenant id
         EmailTemplate updatedTemplate = await _templatesRepository.UpdateAsync(template, autoSave: true);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
index e617cfc77b..19afe129b1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
@@ -10,6 +10,9 @@ public class EmailLogAttachment : AuditedAggregateRoot<Guid>, IMultiTenant
     // Foreign key to EmailLog
     public Guid? EmailLogId { get; set; }
     public Guid? TemplateId { get; set; }
+    
+    // Original template ID when copying from template
+    public Guid? OriginTemplateId { get; set; }
 
     // S3 storage properties
     public string S3ObjectKey { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
index 9e48798cf4..b7b758ba99 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
@@ -9,4 +9,5 @@ public interface IEmailLogAttachmentRepository : IBasicRepository<EmailLogAttach
 {
     Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId);
     Task<List<EmailLogAttachment>> GetByTemplateIdAsync(Guid templateId);
+    Task<List<EmailLogAttachment>> GetOriginAttachmentsByEmailLogIdAsync(Guid emailLogId);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs
index cff3e4c5c7..161293a1ef 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs
@@ -17,7 +17,9 @@ public EmailTemplate(Guid id,
         string subject,
         string bodyText,
         string bodyHTML,
-        string sendFrom)
+        string sendFrom,
+        string? recipientCategory = null,
+        string? recipientIdentifier = null)
         : base(id)
     {
         Name = name;
@@ -26,6 +28,8 @@ public EmailTemplate(Guid id,
         BodyText = bodyText;
         BodyHTML = bodyHTML;
         SendFrom = sendFrom;
+        RecipientCategory = recipientCategory;
+        RecipientIdentifier = recipientIdentifier;
     }
 
     public Guid? TenantId { get; set; }
@@ -37,4 +41,6 @@ public EmailTemplate(Guid id,
     public string BodyText { get; set; } = string.Empty;
     public string BodyHTML { get; set; } = string.Empty;
     public string SendFrom { get; set; } = string.Empty;
+    public string? RecipientCategory { get; set; }
+    public string? RecipientIdentifier { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
index 766db880aa..85c750eed1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
@@ -25,5 +25,11 @@ public async Task<List<EmailLogAttachment>> GetByTemplateIdAsync(Guid templateId
             var dbSet = await GetDbSetAsync();
             return await dbSet.Where(x => x.TemplateId == templateId).ToListAsync();
         }
+
+        public async Task<List<EmailLogAttachment>> GetOriginAttachmentsByEmailLogIdAsync(Guid emailLogId)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.Where(x => x.EmailLogId == emailLogId && x.OriginTemplateId != null).ToListAsync();
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
index bb310dd62c..38e2f1a02e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
@@ -184,7 +184,7 @@ span.tooltip-wrapper {
 
 .template-field {
     flex: 0 0 135px !important;
-    width: 132px !important;
+    min-width: 140px !important;
     white-space: nowrap;
     margin: 0.5rem;    
 }
@@ -221,7 +221,7 @@ body.split-dragging {
 
 /* Update Column Widths via colgroup/col (essential for DataTables-style tables) */
 #TemplatesTable col:nth-child(1) { 
-    width: 25% !important; /* Name */
+    width: 20% !important; /* Name */
 }
 
 #TemplatesTable col:nth-child(2) { 
@@ -229,8 +229,7 @@ body.split-dragging {
 }
 
 #TemplatesTable col:nth-child(3) { 
-    width: 15% !important; /* Actions */
-    min-width: 150px !important;
+    width: 20% !important; /* Actions */
 }
 
 /* Handle text truncation for the content columns */
@@ -278,3 +277,155 @@ body.split-dragging {
     display: none !important;
 }
 
+/* ── Form Control Styling ────────────────────────────────────────────────────── */
+
+input.form-control,
+textarea.form-control,
+.form-select {
+    font-size: var(--bc-font-size);
+    color: var(--bc-colors-grey-text-500);
+    border-radius: var(--bc-layout-margin-small) !important;
+    border: 2px solid var(--bc-colors-blue-primary);
+    text-overflow: ellipsis;
+}
+
+.form-select {
+    --bs-form-select-bg-img: url(data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e);
+    display: block;
+    width: 100%;
+    padding: 0.375rem 2.25rem 0.375rem 0.75rem;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+    color: var(--bs-body-color);
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    background-color: var(--bs-body-bg);
+    background-image: var(--bs-form-select-bg-img), var(--bs-form-select-bg-icon, none);
+    background-repeat: no-repeat;
+    background-position: right 0.75rem center;
+    background-size: 16px 12px;
+    border: var(--bs-border-width) solid var(--bs-border-color);
+    border-radius: var(--bs-border-radius);
+    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+}
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border-radius: 8px;
+  min-height: 40px;
+  border: 2px solid rgb(46, 93, 215);
+  display: flex;
+  align-items: center;
+}
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+select {
+    word-wrap: normal;
+}
+
+button,
+select {
+    text-transform: none;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+    margin: 0;
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+}
+
+
+
+#templateRecipientSelect + .select2-container .select2-selection {
+    border: 2px solid #2e5dd7 !important;
+    border-radius: 8px !important;
+    min-height: 40px !important;
+    display: flex;
+    align-items: center;
+}
+
+/* Match native select elements to the Send From input style */
+#templateRecipientCategory {
+    border: 2px solid #2e5dd7 !important;
+    border-radius: 8px !important;
+    height: 40px !important;
+}
+
+/* Optional: Adjust Select2 search field margins for multi-selects */
+#templateRecipientSelect + .select2-container .select2-search__field {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+/* ── Select2 Selection Choice Refinement ────────────────────────────────────── */
+
+/* Reusable Remove Icon Button */
+.icon-remove,
+.select2-selection__choice__remove {
+    display: inline-flex !important;
+    align-items: center;
+    justify-content: center;
+    width: 16px !important;
+    height: 16px !important;
+    padding: 0 !important;
+    margin-right: 0.5rem;
+    margin-left: 0.25rem;
+    cursor: pointer;
+    background-color: transparent !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath stroke='%23676a6d' stroke-width='2' stroke-linecap='round' d='M2 2l12 12M14 2L2 14'/%3e%3c/svg%3e") !important;
+    background-repeat: no-repeat !important;
+    background-position: center !important;
+    background-size: contain !important;
+    border: none !important;
+    box-shadow: none !important;
+    outline: none !important;
+    appearance: none !important;
+    -webkit-appearance: none !important;
+}
+
+/* Selected Item Container */
+.select2-selection__choice {
+    display: inline-flex !important;
+    align-items: center;
+    padding: 0.3em 0.8em;
+    margin: 0.375rem;
+    font-family: "BCSans", sans-serif;
+    font-size: 1rem;
+    color: #212529;
+    background-color: transparent !important;
+    border: 1px solid var(--bs-border-color) !important;
+    border-radius: 0.25rem;
+    line-height: 1.5;
+    list-style-type: none;
+    white-space: nowrap;
+}
+
+/* Accessibility Fallback */
+.select2-selection__choice__remove span,
+.icon-remove span {
+    display: none !important;
+}
+
+/* ── DataTable Styling (only when right panel is displayed) ────────────────── */
+.split-container.split-active div.dt-scroll-body {
+    overflow-y: auto;
+    padding-right: 15px;
+}
+
+.split-container.split-active td {
+    min-width: 160px;
+    width: 200px;
+    position: relative;
+    margin-left: -20px;
+    transform: translateX(-10px);
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
index 3f97df7bf6..1e24a6d331 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
@@ -20,6 +20,7 @@ $(function () {
         initializeTemplateDataTables();
         initializeDivider();
         initializeTabPersistence();
+        initializeRecipientSelect();
     }
 
     init();
@@ -28,20 +29,45 @@ $(function () {
     function initializeTabPersistence() {
         const tabContainer = $('#nav-tab');
         
-        // Restore saved tab on page load
-        const savedTabId = localStorage.getItem('notifications-active-tab');
-        if (savedTabId) {
-            const tabButton = tabContainer.find(`#${savedTabId}`);
-            if (tabButton.length) {
-                const tab = new bootstrap.Tab(tabButton[0]);
-                tab.show();
-            }
-        }
-        
         // Save tab selection when tab changes
         tabContainer.on('shown.bs.tab', 'button[data-bs-toggle="tab"]', function () {
             localStorage.setItem('notifications-active-tab', this.id);
         });
+        
+        // Handle Templates tab visibility - redraw and reinitialize if needed
+        const templateTabButton = tabContainer.find('#nav-template-tab');
+        if (templateTabButton.length) {
+            templateTabButton.on('show.bs.tab', function () {
+                // Redraw the DataTable when tab is about to show
+                if (templatesDataTable) {
+                    setTimeout(() => {
+                        templatesDataTable.columns.adjust().draw();
+                    }, 0);
+                }
+            });
+        }
+        
+        // Restore saved tab on page load - but delay to ensure DOM is ready
+        const savedTabId = localStorage.getItem('notifications-active-tab');
+        if (savedTabId) {
+            setTimeout(() => {
+                const tabButton = tabContainer.find(`#${savedTabId}`);
+                if (tabButton.length) {
+                    const tab = new bootstrap.Tab(tabButton[0]);
+                    tab.show();
+                }
+            }, 100);
+        }
+    }
+
+    // ── Select2 Initialization ─────────────────────────────────────────────
+    function initializeRecipientSelect() {
+        $('#templateRecipientSelect').select2({
+            theme: 'bootstrap-5',
+            placeholder: 'Select recipients...',
+            allowClear: false,
+            width: '100%'
+        });
     }
 
     // ── Field validation helpers ──────────────────────────────────────────
@@ -71,19 +97,64 @@ $(function () {
     }
 
     function clearAllErrors() {
-        $('#templateName, #sendFrom, #subject, #templateBody').removeClass('is-invalid');
-        $('#templateName-error, #sendFrom-error, #subject-error, #templateBody-error').text('').hide();
+        $('#templateName, #sendFrom, #subject, #templateBody, #templateRecipientCategory, #templateRecipientSelect').removeClass('is-invalid');
+        $('#templateName-error, #sendFrom-error, #subject-error, #templateBody-error, #templateRecipientCategory-error, #templateRecipientSelect-error').text('').hide();
     }
 
     // Listen for user input to clear error styling
-    $('#templateName, #sendFrom, #subject').on('input', function () {
+    $('#templateName, #sendFrom, #subject, #templateRecipientCategory').on('input change', function () {
         clearFieldError(this.id);
     });
 
-    $('#templateBody').on('input change', function () {
+    $('#templateBody, #templateRecipientSelect').on('input change', function () {
         clearFieldError(this.id);
     });
 
+    // ── Recipient helpers ──────────────────────────────────────────────────
+    function fetchRecipients(category) {
+        return $.ajax({
+            url: `/api/form-notifications/recipients?category=${encodeURIComponent(category)}`,
+            type: 'GET',
+            dataType: 'json'
+        });
+    }
+
+    function getSelectedTemplateRecipients() {
+        const val = $('#templateRecipientSelect').val();
+        if (Array.isArray(val)) return val.filter(v => v && v.trim() !== '');
+        return val ? [val] : [];
+    }
+
+    function setSelectedTemplateRecipients(values) {
+        let valueArr = Array.isArray(values) ? values : (values ? [values] : []);
+        $('#templateRecipientSelect').val(valueArr).trigger('change');
+    }
+
+    function populateTemplateRecipients(list) {
+        const sel = $('#templateRecipientSelect');
+        sel.empty();
+        list.forEach(r => {
+            const opt = $('<option></option>').attr('value', r.id).text(r.displayName);
+            sel.append(opt);
+        });
+    }
+
+    // Load recipients when category changes
+    $('#templateRecipientCategory').on('change', function () {
+        const category = $(this).val();
+        if (category) {
+            fetchRecipients(category)
+                .done(function (data) {
+                    populateTemplateRecipients(data);
+                })
+                .fail(function (err) {
+                    console.warn('Failed to load recipients:', err);
+                });
+        } else {
+            $('#templateRecipientSelect').empty();
+        }
+    });
+
     // ── Open / close right panel ──────────────────────────────────────────
     function openRightPanel() {           
         // Activate split layout
@@ -114,13 +185,33 @@ $(function () {
             sendFrom: data.sendFrom,
             subject: data.subject,
             bodyText: data.bodyText || '',
-            bodyHTML: data.bodyHTML
+            bodyHTML: data.bodyHTML,
+            recipientCategory: data.recipientCategory || '',
+            recipientIdentifier: data.recipientIdentifier || ''
         };
         
         $('#templateId').val(data.id);
         $('#templateName').val(data.name);
         $('#sendFrom').val(data.sendFrom);
         $('#subject').val(data.subject);
+        $('#templateRecipientCategory').val(data.recipientCategory || '');
+        
+        // Load recipients if category is set
+        if (data.recipientCategory) {
+            fetchRecipients(data.recipientCategory)
+                .done(function (list) {
+                    populateTemplateRecipients(list);
+                    const values = data.recipientIdentifier ? data.recipientIdentifier.split(',').map(v => v.trim()) : [];
+                    setSelectedTemplateRecipients(values);
+                })
+                .fail(function (err) {
+                    console.warn('Failed to load recipients for edit:', err);
+                });
+        } else {
+            $('#templateRecipientSelect').empty();
+            setSelectedTemplateRecipients([]);
+        }
+        
         UiElements.deleteButton.show();
         $('#email-attachments-section').show();
         initEmailAttachmentsTable(data.id);
@@ -135,13 +226,17 @@ $(function () {
             sendFrom: '',
             subject: '',
             bodyText: '',
-            bodyHTML: ''
+            bodyHTML: '',
+            recipientCategory: '',
+            recipientIdentifier: ''
         };
         
         $('#templateId').val('');
         $('#templateName').val('');
         $('#sendFrom').val('');
         $('#subject').val('');
+        $('#templateRecipientCategory').val('');
+        $('#templateRecipientSelect').empty().val([]).trigger('change');
         UiElements.deleteButton.hide();
         $('#email-attachments-section').hide();
         // Don't load attachments for new templates - they have no ID yet
@@ -153,10 +248,27 @@ $(function () {
             $('#templateName').val(originalFormValues.name);
             $('#sendFrom').val(originalFormValues.sendFrom);
             $('#subject').val(originalFormValues.subject);
+            $('#templateRecipientCategory').val(originalFormValues.recipientCategory || '');
+            
             const editor = tinymce.get('templateBody');
             if (editor) {
                 editor.setContent(originalFormValues.bodyHTML || '');
             }
+            
+            // Restore recipients
+            if (originalFormValues.recipientCategory) {
+                fetchRecipients(originalFormValues.recipientCategory)
+                    .done(function (list) {
+                        populateTemplateRecipients(list);
+                        const values = originalFormValues.recipientIdentifier ? originalFormValues.recipientIdentifier.split(',').map(v => v.trim()) : [];
+                        setSelectedTemplateRecipients(values);
+                    })
+                    .fail(function (err) {
+                        console.warn('Failed to restore recipients:', err);
+                    });
+            } else {
+                $('#templateRecipientSelect').empty().val([]).trigger('change');
+            }
         }
     });
 
@@ -169,6 +281,7 @@ $(function () {
         const templateName = $('#templateName').val();
         const sendFrom = $('#sendFrom').val();
         const subject = $('#subject').val();
+        const recipientCategory = $('#templateRecipientCategory').val();
         const editor = tinymce.get('templateBody');
         const bodyHTML = editor ? editor.getContent().trim() : '';
 
@@ -198,6 +311,13 @@ $(function () {
             markFieldError('templateBody', 'Template body is required.');
         }
 
+        // Validate recipients: if category is selected, recipients must be selected
+        const selectedRecipients = getSelectedTemplateRecipients();
+        if (recipientCategory && selectedRecipients.length === 0) {
+            validationErrors.push('Recipients are required when Recipient Category is selected.');
+            markFieldError('templateRecipientSelect', 'Recipients are required when Recipient Category is selected.');
+        }
+
         // Show single error popup if there are validation errors
         if (validationErrors.length > 0) {
             return abp.notify.error(validationErrors.join('<br>'));
@@ -209,7 +329,9 @@ $(function () {
             sendFrom: sendFrom,
             subject: subject,
             bodyText: '',
-            bodyHTML: bodyHTML
+            bodyHTML: bodyHTML,
+            recipientCategory: recipientCategory || null,
+            recipientIdentifier: selectedRecipients.length > 0 ? selectedRecipients.join(',') : null
         };
 
         const isNewTemplate = !templateId || templateId.trim() === '';
@@ -241,7 +363,9 @@ $(function () {
                         sendFrom: sendFrom,
                         subject: subject,
                         bodyText: '',
-                        bodyHTML: bodyHTML
+                        bodyHTML: bodyHTML,
+                        recipientCategory: templateData.recipientCategory || '',
+                        recipientIdentifier: templateData.recipientIdentifier || ''
                     };
                     // Now show attachments section and initialize table
                     $('#email-attachments-section').show();
@@ -360,13 +484,15 @@ $(function () {
                 title: 'Name',
                 name: 'name',
                 data: 'name',
-                index: 1
+                index: 1,
+                width: '20%'
             },
             {
                 title: 'Subject',
                 name: 'subject',
                 data: 'subject',
-                index: 2
+                index: 2,
+                width: '60%'
             },
             {
                 title: 'Actions',
@@ -375,7 +501,7 @@ $(function () {
                 orderable: false,
                 searchable: false,
                 index: 3,
-                width: '210px',
+                width: '20%',
                 render: function (data, type, row) {
                     return `
                         <div class="d-inline-flex gap-2">
@@ -427,6 +553,54 @@ $(function () {
             fixedHeaders: true
         });
 
+        // ── Auto-select template from localStorage if navigating from email editor ──
+        let hasCheckedAutoSelect = false;
+        $('#TemplatesTable').on('draw.dt', function () {
+            if (hasCheckedAutoSelect) return; // Only check once
+            
+            const templateToSelectId = localStorage.getItem('notifications-template-to-select');
+            if (!templateToSelectId) return;
+            
+            hasCheckedAutoSelect = true;
+            localStorage.removeItem('notifications-template-to-select');
+            
+            // Ensure Templates tab is active
+            const templateTab = document.getElementById('nav-template-tab');
+            if (templateTab && !templateTab.classList.contains('active')) {
+                const tab = new bootstrap.Tab(templateTab);
+                tab.show();
+            }
+            
+            // Wait for tab transition to complete, then find and select the template
+            setTimeout(() => {
+                const rows = templatesDataTable.rows().data();
+                for (let i = 0; i < rows.length; i++) {
+                    if (rows[i].id === templateToSelectId) {
+                        const $row = $(templatesDataTable.row(i).node());
+                        
+                        // Trigger the same selection logic
+                        const rowData = templatesDataTable.row(i).data();
+                        if (rowData) {
+                            initializeTemplateVariables();
+                            initializeEditor(rowData, dropdownItems);
+                            populateFields(rowData);
+                            
+                            // Highlight selected row
+                            $('#TemplatesTable tbody tr').removeClass('template-selected');
+                            $row.addClass('template-selected');
+                            openRightPanel();
+                            
+                            // Publish event for pub/sub listeners
+                            PubSub.publish('template_selected_from_email_editor', {
+                                templateId: templateToSelectId
+                            });
+                        }
+                        break;
+                    }
+                }
+            }, 150);
+        });
+
         // ── Row click → open version panel ──────────────────────────────────────
         $('#TemplatesTable').on('click', 'tbody tr', function (e) {
             // Don't intercept action-column clicks
@@ -815,7 +989,8 @@ function initializeEditor(data, dropdownItems) {
         license_key: 'gpl',
         selector: `#${templateId}`,
         plugins: 'lists link image preview code',
-        toolbar: 'undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview | variablesDropdownButton',
+        menubar: 'file edit view insert format tools',
+        toolbar: 'variablesButton | undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview',
         resize: true,
         statusbar: true,
         elementpath: false,
@@ -830,9 +1005,18 @@ function initializeEditor(data, dropdownItems) {
 }
 
 function setupEditor(editor, id, editorId, data, dropdownItems) {
-    editor.ui.registry.addMenuButton('variablesDropdownButton', {
-        text: 'VARIABLES',
-        fetch: fetchVariablesMenuItems(dropdownItems, editor)
+    editor.ui.registry.addMenuButton('variablesButton', {
+        text: 'Variables',
+        fetch: (callback) => {
+            const items = dropdownItems.map(item => ({
+                type: 'menuitem',
+                text: item.text,
+                onAction: () => {
+                    editor.insertContent(`{{${item.value}}}`);
+                }
+            }));
+            callback(items);
+        }
     });
 
     editor.on('init', function () {
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs
index 36c9add108..62031be8ef 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs
@@ -43,6 +43,9 @@ public override void ConfigureBundle(BundleConfigurationContext context)
             context
                 .Files
                 .AddIfNotContains("/Views/Settings/NotificationsSettingGroup/InternalEmailGroups.js");
+            context
+                .Files
+                .AddIfNotContains("/libs/select2/dist/js/select2.full.min.js");
         }
     }
 
@@ -52,6 +55,10 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         {
            context.Files
                 .AddIfNotContains("/Views/Settings/NotificationsSettingGroup/Default.css");
+            context.Files
+                .AddIfNotContains("/libs/select2/dist/css/select2.min.css");
+            context.Files
+                .AddIfNotContains("/libs/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css");
         }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
index 12a4040364..e09b8ab96b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
@@ -27,6 +27,29 @@
             </div>
         </div>
     </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="templateRecipientCategory" class="form-label template-field">Recipient Category</label>
+            <div class="flex-grow-1">
+                <select id="templateRecipientCategory" class="form-control form-select" name="templateRecipientCategory">
+                    <option value=""></option>
+                    <option value="Internal">Internal</option>
+                    <option value="External">External</option>
+                </select>
+                <div id="templateRecipientCategory-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="templateRecipientSelect" class="form-label template-field">Recipients</label>
+            <div class="flex-grow-1">
+                <select id="templateRecipientSelect" class="form-control form-select" name="templateRecipientSelect" multiple>
+                </select>
+                <div id="templateRecipientSelect-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
     <div class="mb-3">
         <div class="d-flex template-field-div">
             <label for="subject" class="form-label template-field">Subject</label>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs
index 5399e4c196..db627a3398 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs
@@ -99,65 +99,26 @@ public async Task PublishToEmailGroupAsync(
             ScheduledNotification notification,
             EmailNotificationEvent emailEvent)
         {
-            var allGroups = await emailGroupsAppService.GetListAsync();
-            
-            // Split comma-separated recipient identifiers and process each
-            var recipientIdentifiers = notification.RecipientIdentifier?
-                .Split(',')
-                .Select(r => r.Trim())
-                .Where(r => !string.IsNullOrWhiteSpace(r))
-                .ToList() ?? [];
-
-            if (recipientIdentifiers.Count == 0)
-            {
-                _logger.LogWarning(
-                    "ScheduledNotificationHelper: No recipient identifiers provided for notification {NotificationId}, skipping.",
-                    notification.Id);
-                return;
-            }
-
-            var emailAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (var recipientId in recipientIdentifiers)
-            {
-                var group = allGroups.FirstOrDefault(g =>
-                    string.Equals(g.Name, recipientId, StringComparison.OrdinalIgnoreCase));
-
-                if (group == null)
-                {
-                    _logger.LogWarning(
-                        "ScheduledNotificationHelper: Email group '{GroupName}' not found for notification {NotificationId}, skipping group.",
-                        recipientId, notification.Id);
-                    continue;
-                }
-
-                var groupUsers = await emailGroupUsersAppService.GetEmailGroupUsersByGroupIdAsync(group.Id);
-                if (groupUsers.Count == 0)
-                {
-                    _logger.LogWarning(
-                        "ScheduledNotificationHelper: Email group '{GroupName}' has no members for notification {NotificationId}, skipping group.",
-                        recipientId, notification.Id);
-                    continue;
-                }
-
-                foreach (var groupUser in groupUsers)
-                {
-                    var user = await identityUserIntegrationService.FindByIdAsync(groupUser.UserId);
-                    if (user != null && !string.IsNullOrWhiteSpace(user.Email))
-                    {
-                        emailAddresses.Add(user.Email);
-                    }
-                }
-            }
-
-            if (emailAddresses.Count == 0)
+            var recipientEmails = await GetInternalRecipientEmailAddressesAsync(
+                notification,
+                emailGroupsAppService,
+                emailGroupUsersAppService,
+                identityUserIntegrationService);
+
+            var recipients = recipientEmails
+                .Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            if (recipients.Count == 0)
             {
                 _logger.LogWarning(
                     "ScheduledNotificationHelper: No resolvable email addresses in any groups for notification {NotificationId}, skipping.",
                     notification.Id);
                 return;
             }
-            emailEvent.EmailAddressList = [.. emailAddresses];            
+
+            emailEvent.EmailAddressList = [.. recipients];
             await localEventBus.PublishAsync(emailEvent);
         }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
index 70e2d1448b..51d12a9b10 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
@@ -32,27 +32,31 @@ public class ApplicationLinksAppService(IRepository<ApplicationLink, Guid> repos
     public IApplicationRepository ApplicationRepository { get; set; } = null!;
     public IApplicantRepository ApplicantRepository { get; set; } = null!;
     public IApplicationFormAppService ApplicationFormAppService { get; set; } = null!;
+    public IRepository<ApplicationStatus, Guid> ApplicationStatusRepository { get; set; } = null!;
 
     public async Task<List<ApplicationLinksInfoDto>> GetListByApplicationAsync(Guid applicationId)
     {
         var applicationLinksQuery = await ApplicationLinksRepository.GetQueryableAsync();
         var applicationsQuery = await ApplicationRepository.GetQueryableAsync();
         var applicantsQuery = await ApplicantRepository.GetQueryableAsync();
+        var statusQuery = await ApplicationStatusRepository.GetQueryableAsync();
 
         // Get basic application and applicant data without form details
         var basicQuery = from applicationLinks in applicationLinksQuery
                         join application in applicationsQuery on applicationLinks.LinkedApplicationId equals application.Id into appLinks
                         from application in appLinks.DefaultIfEmpty() // Left join for safety
+                        join status in statusQuery on application.ApplicationStatusId equals status.Id into appStatuses
+                        from status in appStatuses.DefaultIfEmpty() // Left join to avoid split query navigation issue
                         join applicant in applicantsQuery on application.ApplicantId equals applicant.Id into applicants
                         from applicant in applicants.DefaultIfEmpty() // Left join for safety
                         where applicationLinks.ApplicationId == applicationId || applicationLinks.LinkedApplicationId == applicationId
                         select new
                         {
                             Id = applicationLinks.Id,
-                            ApplicationId = application.Id,
-                            ApplicationStatus = application.ApplicationStatus.InternalStatus,
-                            ReferenceNumber = application.ReferenceNo,
-                            ProjectName = application.ProjectName,
+                            ApplicationId = application != null ? application.Id : Guid.Empty,
+                            ApplicationStatus = status != null ? status.InternalStatus : GrantManagerConsts.UnknownValue,
+                            ReferenceNumber = application != null ? application.ReferenceNo : GrantManagerConsts.UnknownValue,
+                            ProjectName = application != null ? application.ProjectName : GrantManagerConsts.UnknownValue,
                             ApplicantName = applicant.ApplicantName ?? GrantManagerConsts.UnknownValue,
                             LinkType = applicationLinks.LinkType
                         };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs
new file mode 100644
index 0000000000..f1867ee49b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs
@@ -0,0 +1,118 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260703230000_AddRecipientColumnsToEmailTemplates")]
+    partial class AddRecipientColumnsToEmailTemplates
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs
new file mode 100644
index 0000000000..2c2a241785
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs
@@ -0,0 +1,55 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddRecipientColumnsToEmailTemplates : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "RecipientCategory",
+                schema: "Notifications",
+                table: "EmailTemplates",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RecipientIdentifier",
+                schema: "Notifications",
+                table: "EmailTemplates",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "OriginTemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RecipientCategory",
+                schema: "Notifications",
+                table: "EmailTemplates");
+
+            migrationBuilder.DropColumn(
+                name: "RecipientIdentifier",
+                schema: "Notifications",
+                table: "EmailTemplates");
+
+            migrationBuilder.DropColumn(
+                name: "OriginTemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
index 71823c6d0c..1850dcb94e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
@@ -5,6 +5,10 @@
 using Unity.GrantManager.GrantApplications;
 using Unity.Notifications.EmailGroups;
 using System.Threading.Tasks;
+using Unity.Notifications.Emails;
+using Volo.Abp.Users;
+using Unity.GrantManager.Events;
+using Volo.Abp.Identity.Integration;
 
 namespace Unity.GrantManager.Web.Controllers
 {
@@ -16,13 +20,25 @@ public class FormNotificationsApiController : ControllerBase
         private readonly IEmailGroupsAppService _emailGroupsAppService;
         private readonly Unity.Notifications.Templates.ITemplateService _templateService;
         private readonly Notifications.IAutomatedNotificationAppService _automatedNotificationAppService;
-
-        public FormNotificationsApiController(IApplicationStatusService statusService, IEmailGroupsAppService emailGroupsAppService, Unity.Notifications.Templates.ITemplateService templateService, Unity.GrantManager.Notifications.IAutomatedNotificationAppService automatedNotificationAppService)
+        private readonly IEmailLogAttachmentRepository _emailLogAttachmentRepository;
+        private readonly ICurrentUser _currentUser;
+        private readonly IEmailGroupUsersAppService _emailGroupUsersAppService;
+        private readonly IIdentityUserIntegrationService _identityUserIntegrationService;
+        private readonly IGrantApplicationAppService _grantApplicationAppService;
+        private readonly ScheduledNotificationHelper _scheduledNotificationHelper;
+
+        public FormNotificationsApiController(IApplicationStatusService statusService, IEmailGroupsAppService emailGroupsAppService, Unity.Notifications.Templates.ITemplateService templateService, Unity.GrantManager.Notifications.IAutomatedNotificationAppService automatedNotificationAppService, IEmailLogAttachmentRepository emailLogAttachmentRepository, ICurrentUser currentUser, IEmailGroupUsersAppService emailGroupUsersAppService, IIdentityUserIntegrationService identityUserIntegrationService, IGrantApplicationAppService grantApplicationAppService, ScheduledNotificationHelper scheduledNotificationHelper)
         {
             _statusService = statusService;
             _emailGroupsAppService = emailGroupsAppService;
             _templateService = templateService;
             _automatedNotificationAppService = automatedNotificationAppService;
+            _emailLogAttachmentRepository = emailLogAttachmentRepository;
+            _currentUser = currentUser;
+            _emailGroupUsersAppService = emailGroupUsersAppService;
+            _identityUserIntegrationService = identityUserIntegrationService;
+            _grantApplicationAppService = grantApplicationAppService;
+            _scheduledNotificationHelper = scheduledNotificationHelper;
         }
         // In-memory storage removed; persisting to ScheduledNotifications table via IAutomatedNotificationAppService
 
@@ -36,12 +52,144 @@ public async Task<ActionResult<List<EmailTemplateDto>>> GetTemplates()
                 Id = t.Id,
                 Name = t.Name,
                 Subject = t.Subject,
-                Body = t.BodyText
+                Body = t.BodyHTML,
+                SendFrom = t.SendFrom,
+                RecipientCategory = t.RecipientCategory,
+                RecipientIdentifier = t.RecipientIdentifier
             }).ToList();
 
             return Ok(list);
         }
 
+        [HttpGet("templates/{templateId:guid}/resolved-recipients")]
+        public async Task<ActionResult<ResolvedRecipientsDto>> GetResolvedTemplateRecipients(Guid templateId, [FromQuery] Guid? applicationId = null)
+        {
+            var template = await _templateService.GetTemplateById(templateId);
+            if (template == null)
+            {
+                return NotFound();
+            }
+
+            var recipientCategory = template.RecipientCategory?.Trim();
+            var recipientIdentifier = template.RecipientIdentifier?.Trim();
+            if (string.IsNullOrWhiteSpace(recipientCategory) || string.IsNullOrWhiteSpace(recipientIdentifier))
+            {
+                return Ok(new ResolvedRecipientsDto { EmailTo = string.Empty });
+            }
+
+            if (string.Equals(recipientCategory, "Internal", StringComparison.OrdinalIgnoreCase))
+            {
+                var notification = new Notifications.ScheduledNotification
+                {
+                    RecipientCategory = recipientCategory,
+                    RecipientIdentifier = recipientIdentifier
+                };
+
+                var emailTo = await _scheduledNotificationHelper.GetInternalRecipientEmailAddressesAsync(
+                    notification,
+                    _emailGroupsAppService,
+                    _emailGroupUsersAppService,
+                    _identityUserIntegrationService);
+
+                return Ok(new ResolvedRecipientsDto { EmailTo = emailTo });
+            }
+
+            if (string.Equals(recipientCategory, "External", StringComparison.OrdinalIgnoreCase))
+            {
+                if (!applicationId.HasValue || applicationId.Value == Guid.Empty)
+                {
+                    return Ok(new ResolvedRecipientsDto { EmailTo = string.Empty });
+                }
+
+                var application = await _grantApplicationAppService.GetAsync(applicationId.Value);
+                var identifiers = recipientIdentifier
+                    .Split(',')
+                    .Select(r => r.Trim())
+                    .Where(r => !string.IsNullOrWhiteSpace(r))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+
+                var emailAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+                foreach (var identifier in identifiers)
+                {
+                    if (identifier.Contains('@'))
+                    {
+                        emailAddresses.Add(identifier);
+                        continue;
+                    }
+
+                    if (string.Equals(identifier, "ApplicationContact", StringComparison.OrdinalIgnoreCase) &&
+                        !string.IsNullOrWhiteSpace(application.ContactEmail))
+                    {
+                        emailAddresses.Add(application.ContactEmail);
+                        continue;
+                    }
+
+                    if (string.Equals(identifier, "SigningAuthority", StringComparison.OrdinalIgnoreCase) &&
+                        !string.IsNullOrWhiteSpace(application.SigningAuthorityEmail))
+                    {
+                        emailAddresses.Add(application.SigningAuthorityEmail);
+                    }
+                }
+
+                return Ok(new ResolvedRecipientsDto { EmailTo = string.Join("; ", emailAddresses) });
+            }
+
+            return Ok(new ResolvedRecipientsDto { EmailTo = string.Empty });
+        }
+
+        [HttpPost("email-template/{templateId}/copy-attachments")]
+        public async Task<ActionResult<CopyAttachmentsResponseDto>> CopyTemplateAttachments(Guid templateId, [FromBody] CopyAttachmentsInput input)
+        {
+            if (input.EmailLogId == Guid.Empty)
+                return BadRequest("EmailLogId is required");
+
+            // Get all attachments for the template
+            var templateAttachments = await _emailLogAttachmentRepository.GetByTemplateIdAsync(templateId);
+
+            if (templateAttachments.Count == 0)
+            {
+                return Ok(new CopyAttachmentsResponseDto { AttachmentCount = 0 });
+            }
+
+            // Copy attachments to the email log
+            int copiedCount = 0;
+            foreach (var templateAttachment in templateAttachments)
+            {
+                var newAttachment = new EmailLogAttachment
+                {
+                    EmailLogId = input.EmailLogId,
+                    TemplateId = null,
+                    OriginTemplateId = templateId,
+                    S3ObjectKey = templateAttachment.S3ObjectKey,
+                    FileName = templateAttachment.FileName,
+                    DisplayName = templateAttachment.DisplayName,
+                    ContentType = templateAttachment.ContentType,
+                    FileSize = templateAttachment.FileSize,
+                    Time = DateTime.UtcNow,
+                    UserId = _currentUser.Id ?? Guid.Empty,
+                    TenantId = _currentUser.TenantId ?? Guid.Empty
+                };
+
+                await _emailLogAttachmentRepository.InsertAsync(newAttachment);
+                copiedCount++;
+            }
+
+            return Ok(new CopyAttachmentsResponseDto { AttachmentCount = copiedCount });
+        }
+
+        [HttpDelete("email-log/{emailLogId}/origin-attachments")]
+        public async Task<ActionResult<CopyAttachmentsResponseDto>> DeleteOriginAttachments(Guid emailLogId)
+        {
+            var attachments = await _emailLogAttachmentRepository.GetOriginAttachmentsByEmailLogIdAsync(emailLogId);
+            foreach (var attachment in attachments)
+            {
+                await _emailLogAttachmentRepository.DeleteAsync(attachment.Id);
+            }
+            return Ok(new CopyAttachmentsResponseDto { AttachmentCount = attachments.Count });
+        }
+
         [HttpGet("statuses")]
         public async Task<ActionResult<List<object>>> GetApplicationStatuses()
         {
@@ -259,6 +407,9 @@ public record EmailTemplateDto
         public string Name { get; init; } = string.Empty;
         public string Subject { get; init; } = string.Empty;
         public string Body { get; init; } = string.Empty;
+        public string SendFrom { get; init; } = string.Empty;
+        public string? RecipientCategory { get; init; }
+        public string? RecipientIdentifier { get; init; }
     }
 
     public record ScheduledNotificationDto
@@ -292,4 +443,19 @@ public record RecipientDto
         public string Id { get; init; } = string.Empty;
         public string DisplayName { get; init; } = string.Empty;
     }
+
+    public record CopyAttachmentsInput
+    {
+        public Guid EmailLogId { get; init; }
+    }
+
+    public record CopyAttachmentsResponseDto
+    {
+        public int AttachmentCount { get; init; }
+    }
+
+    public record ResolvedRecipientsDto
+    {
+        public string EmailTo { get; init; } = string.Empty;
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
index 2782637ef8..a37c0568ee 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
@@ -3,19 +3,24 @@
     const configSections = $('.config-section');
     const ACTIVE_MENU_KEY = 'ConfigurationManagement_ActiveMenu';
     const ACTIVE_PAYMENTS_TAB_KEY = 'payments-active-tab';
+    const ACTIVE_NOTIFICATIONS_TAB_KEY = 'notifications-active-tab';
 
     init();
 
     function init() {
         menuItems.on('click', menuItemClick);
 
-        // Adjust DataTables when Payments internal tabs are shown
+        // Adjust DataTables when tabs are shown
         $('button[data-bs-toggle="tab"]').on('shown.bs.tab', function () {
             adjustDataTables();
             // Save active payments tab
             if ($(this).closest('#payments-nav-tab').length) {
                 localStorage.setItem(ACTIVE_PAYMENTS_TAB_KEY, this.id);
             }
+            // Save active notifications tab
+            if ($(this).closest('#nav-tab').length) {
+                localStorage.setItem(ACTIVE_NOTIFICATIONS_TAB_KEY, this.id);
+            }
         });
 
         // Restore the last active menu item from localStorage, fallback to first
@@ -41,6 +46,20 @@
             const tab = new bootstrap.Tab(paymentTabToActivate[0]);
             tab.show();
         }
+
+        // Auto-activate saved Notifications tab or first tab
+        const savedNotificationsTabId = localStorage.getItem(ACTIVE_NOTIFICATIONS_TAB_KEY);
+        const notificationsTabContainer = $('#nav-tab');
+        let notificationsTabToActivate = notificationsTabContainer.find('#' + savedNotificationsTabId);
+        
+        if (!notificationsTabToActivate.length) {
+            notificationsTabToActivate = notificationsTabContainer.find('.nav-link').first();
+        }
+        
+        if (notificationsTabToActivate.length) {
+            const tab = new bootstrap.Tab(notificationsTabToActivate[0]);
+            tab.show();
+        }
     }
 
     const splitRestoreMap = {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml
index c7da4a4e8e..15e47c29f1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml
@@ -4,7 +4,8 @@
     ViewData["Title"] = "Form Configuration";
 }
 @section Scripts {
-    <script src="/lib/select2/js/select2.min.js"></script>
+    <script src="/libs/select2/js/select2.min.js"></script>
+    <script src="/js/formConfiguration/NotificationsPreview.js"></script>
     <script src="/js/formConfiguration/Notifications.js"></script>
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
index fdb43b0644..993cbcb86f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
@@ -7,14 +7,19 @@
     }
 
     let responseCallback = function (result) {
+        const normalizedResult = (result || []).map(item => ({
+            ...item,
+            templateName: resolveTemplateName(item)
+        }));
+
         if (result) {
             setTimeout(function () {
-                PubSub.publish('update_application_emails_count', { itemCount: result.length });
+                PubSub.publish('update_application_emails_count', { itemCount: normalizedResult.length });
             }, 10);
         }
 
         return {
-            data: result
+            data: normalizedResult
         };
     };
 
@@ -68,8 +73,7 @@
                             year: "numeric",
                             month: "numeric",
                             hour: "numeric",
-                            minute: "numeric",
-                            second: "numeric"
+                            minute: "numeric"
                         }) : '—';
                     }
                 },
@@ -86,8 +90,7 @@
                             year: "numeric",
                             month: "numeric",
                             hour: "numeric",
-                            minute: "numeric",
-                            second: "numeric"
+                            minute: "numeric"
                         }) : '—';
                     }
                 },
@@ -111,7 +114,7 @@
                     visible: enableEmailDelay,
                     render: function (data, type) {
                         if (!data) return '—';
-                        return DateUtils.formatUtcToBcPacificDateTime(data, type) || '—';
+                        return formatScheduledSendDateTimeUtcToPacific(data, type) || '—';
                     }
                 },
                 {
@@ -156,9 +159,9 @@
                         }
                         // Show cancel button for scheduled sends that haven't passed yet
                         else if (full.sendOnDateTime && abp.auth.isGranted('Notifications.Email.CancelScheduled')) {
-                            const sendOnDateTime = new Date(full.sendOnDateTime);
-                            const now = new Date();
-                            if (sendOnDateTime > now) {
+                            const sendOnDateTime = parseUtcDateTime(full.sendOnDateTime);
+                            const now = luxon.DateTime.utc();
+                            if (sendOnDateTime && sendOnDateTime > now) {
                                 return generateCancelScheduledButtonContent(full, meta.row);
                             }
                         }
@@ -203,8 +206,13 @@
         let column = emailHistoryDataTable.column(this);
 
         if (column.index() > 0 && column.index() < 4) {
-            let data = row.data();
-            PubSub.publish('email_selected', data);
+            const data = row.data();
+            const normalizedSelectedRow = {
+                ...data,
+                templateName: resolveTemplateName(data)
+            };
+
+            PubSub.publish('email_selected', normalizedSelectedRow);
         }
     });
 
@@ -217,6 +225,54 @@
     });
 });
 
+function resolveTemplateName(emailRow) {
+    const value = [
+        emailRow?.templateName,
+        emailRow?.emailTemplateName,
+        emailRow?.template,
+        emailRow?.TemplateName,
+        emailRow?.EmailTemplateName,
+        emailRow?.Template
+    ].find(v => typeof v === 'string' && v.trim().length > 0);
+
+    return (value || '').trim();
+}
+
+function parseUtcDateTime(value) {
+    if (!value) {
+        return null;
+    }
+
+    const normalized = String(value).trim().replace(' ', 'T');
+    const withUtcSuffix = /([zZ]|[+-]\d{2}:?\d{2})$/.test(normalized)
+        ? normalized
+        : `${normalized}Z`;
+
+    const dateTime = luxon.DateTime.fromISO(withUtcSuffix, { zone: 'utc' });
+    return dateTime.isValid ? dateTime : null;
+}
+
+function formatScheduledSendDateTimeUtcToPacific(value, type) {
+    if (type !== 'display' && type !== 'filter') {
+        return value;
+    }
+
+    const utcDateTime = parseUtcDateTime(value);
+    if (!utcDateTime) {
+        return '—';
+    }
+
+    return utcDateTime
+        .setZone('UTC-7')
+        .toLocaleString({
+            day: 'numeric',
+            year: 'numeric',
+            month: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric'
+        });
+}
+
 function generateCancelScheduledButtonContent(full, row) {
     return `<button class="btn btn-delete-delayed" type="button" onclick="cancelScheduledEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index 5afa3e37fc..af93642758 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -70,6 +70,7 @@
 
     <form id="EmailForm" class="email-form" autocomplete="off">
         <abp-input type="hidden" id="ApplicationId" asp-for="@Model.ApplicationId" />
+        <input type="hidden" id="EmailTemplateName" name="EmailTemplateName" value="" />
         <fieldset @emailFieldsetState>
             <legend class="d-none">Email Form</legend>
             <input type="hidden" id="EmailId" name="EmailId" />
@@ -131,7 +132,7 @@
                 </abp-column>
             </abp-row>
 
-             <abp-row id="scheduled-delay-section"class="m-0 p-0 align-items-center" abp-if="enableScheduleSend">
+             <abp-row id="scheduled-delay-section"class="m-0 p-0 align-items-center" abp-if="@enableScheduleSend">
                 <abp-row class="m-0 p-0 align-items-center">
                     <abp-column size="_12" class="px-1">
                         <div id="scheduled-display-container" class="d-flex align-items-center gap-2 flex-wrap">
@@ -163,36 +164,29 @@
                     </button>
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0 align-items-center">
-                <abp-column class="col-auto px-1">
+            <abp-row class="m-0 p-0 align-items-start row">
+                <abp-column class="col-auto px-1 mt-14">
                     <label for="EmailCC" class="form-label mb-0">Cc:</label>
                 </abp-column>
                 <abp-column class="col px-1">
                     <abp-input asp-for="@Model.EmailCC" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0 align-items-center" id="bcc-input-row">
-                <abp-column class="col-auto px-1">
+            <abp-row class="m-0 p-0 align-items-start row" id="bcc-input-row">
+                <abp-column class="col-auto px-1 mt-14">
                     <label for="EmailBCC" class="form-label mb-0">Bcc:</label>
                 </abp-column>
                 <abp-column class="col px-1">
                     <abp-input asp-for="@Model.EmailBCC" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0 align-items-center" id="templateListContainer">
-                <abp-column size="_12" class="px-1">
-                    <abp-select asp-for="@Model.EmailTemplate" asp-items="@Model.TemplatesList" id="EmailTemplate" suppress-label="true">
-                        <option value="">Select a template</option>
-                    </abp-select>
-                </abp-column>
-            </abp-row>
-            <abp-row class="m-0 p-0 align-items-center">
+            <abp-row class="m-0 p-0 align-items-start row">
                 <abp-column size="_12" class="px-1">
                     <abp-input asp-for="@Model.EmailSubject" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
             <abp-row class="m-0 p-0 px-1">
-                <abp-column size="_12" class="px-1">
+                <abp-column size="_12" class="px-2">
                     <abp-input asp-for="@Model.EmailBody" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
index 97b953a8ae..11e4eaea94 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
@@ -17,12 +17,16 @@
 #applicationEmailsWidget .email-input {
     outline: 0;
     margin-right: 8px;
-    margin-left: 8px;
+    margin-left: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
     height: 36px;
 }
 
+#applicationEmailsWidget input.form-control {
+    width: 99%;
+}
+
 #applicationEmailsWidget .label-column-aligned {
     display: flex;
     align-items: flex-start;
@@ -420,11 +424,22 @@
 }
 
 #applicationEmailsWidget .input-validation-error {
+    border: 1px solid #dc3545 !important;
+    border-style: solid !important;
     border-color: #dc3545 !important;
     border-width: 1px !important;
     box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 0.2rem rgba(220, 53, 69, 0.5) !important;
 }
 
+#applicationEmailsWidget .input-validation-error:focus,
+#applicationEmailsWidget input.input-validation-error:focus,
+#applicationEmailsWidget textarea.input-validation-error:focus,
+#applicationEmailsWidget select.input-validation-error:focus {
+    border: 1px solid #dc3545 !important;
+    border-color: #dc3545 !important;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 0.2rem rgba(220, 53, 69, 0.5) !important;
+}
+
 #applicationEmailsWidget .from-field-container .field-validation-error {
     position: absolute;
     top: 85%;
@@ -856,4 +871,200 @@ input#EmailFrom.input-validation-error {
 	to {
 		transform: rotate(360deg);
 	}
-}
\ No newline at end of file
+}
+
+/* ============================================
+   TinyMCE Email Composer Styling
+   ============================================ */
+
+/* Hide TinyMCE toolbar completely */
+.tox-tinymce:has(#EmailBody) .tox-toolbar__primary {
+    display: none !important;
+}
+
+/* Container for template label and menu buttons */
+.tinymce-template-label-top-right {
+    position: static !important;
+    font-size: 13px;
+    color: #444;
+    user-select: none;
+    display: flex;
+    gap: 5px;
+    align-items: center;
+    justify-content: flex-end;
+    margin: 0 0 8px;
+    width: 100%;
+}
+
+/* Template label text */
+
+.template-label-text {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  padding: 6px 14px;
+  font-size: 18px;
+  font-weight: 700 !important;
+  line-height: 18px;
+  color: #6c757d !important;
+  background-color: transparent;
+  border: 1px solid #6c757d !important;
+  border-radius: 3px;
+  cursor: pointer !important;
+  transition: all 0.15s ease-in-out;
+}
+
+.template-label-text:hover {
+  background-color: #6c757d;
+  color: #fff !important;
+}
+
+
+
+.template-label-text.no-permission {
+    cursor: default;
+    background: #f9f9f9;
+}
+
+/* TinyMCE-style toolbar group for templates button */
+.templates-toolbar-group {
+    display: flex;
+    align-items: center;
+    gap: 0;
+    padding: 0;
+    margin: 0;
+}
+
+/* TinyMCE-style menu button */
+.tinymce-menu-button {
+    display: inline-flex;
+    align-items: center;
+    padding: 0;
+    background: #f0f0f0;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 14px;
+    white-space: nowrap;
+    user-select: none;
+    position: relative;
+    height: 32px;
+    min-width: 60px;
+    transition: background-color 0.1s ease-in-out;
+}
+
+.tinymce-menu-button:hover {
+    background: #e0e0e0;
+}
+
+.tinymce-menu-button:active {
+    background: #d0d0d0;
+}
+
+.tinymce-menu-button.tox-tbtn--select {
+    justify-content: space-between;
+    padding: 0 8px;
+    gap: 4px;
+}
+
+.tox-tbtn__select-label {
+    display: inline-block;
+    font-weight: 500;
+    color: #333;
+    font-size: 13px;
+}
+
+.tox-tbtn__select-chevron {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+}
+
+.tox-tbtn__select-chevron svg {
+    width: 10px;
+    height: 10px;
+    display: block;
+}
+
+/* Dropdown menu styling */
+.templates-dropdown-menu {
+    position: fixed !important;
+    background: #fff;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.15);
+    z-index: 9999 !important;
+    min-width: 250px;
+    max-height: 300px;
+    overflow-y: auto;
+    margin-top: 2px;
+}
+
+/* Custom dropdown menu styling (not Bootstrap) */
+.custom-dropdown-menu {
+    list-style: none;
+    padding: 0 !important;
+    margin: 0 !important;
+    display: block !important;
+}
+
+.custom-dropdown-item {
+    padding: 8px 12px;
+    cursor: pointer;
+    border-bottom: 1px solid #eee;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    transition: background 0.15s ease-in-out;
+    display: block !important;
+}
+
+.custom-dropdown-item:hover {
+    background: #f5f5f5;
+}
+
+.custom-dropdown-item:last-child {
+    border-bottom: none !important;
+}
+
+/* Position Templates button in top right of toolbar */
+.tox:has(#EmailBody) .templates-button-container {
+    position: absolute !important;
+    top: 5px !important;
+    right: 10px !important;
+    z-index: 10 !important;
+}
+
+.tox *:not(svg):not(rect)& {
+    background-color: initial;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    font-size: 14px !important;
+    font-weight: 400 !important;
+    font-style: normal;
+    color: rgb(34, 47, 62) !important;
+}
+
+/* Style the Templates select element */
+.templates-select {
+    background: #f7f7f7 !important;
+    padding: 4px 8px !important;
+    border: 1px solid #ccc !important;
+    border-radius: 3px !important;
+    cursor: pointer !important;
+    font-size: 13px !important;
+    white-space: nowrap !important;
+    user-select: none !important;
+    height: 37px !important;
+}
+
+
+
+
+.templates-select:active,
+.templates-select:focus {
+    outline: none !important;
+}
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 2634aa9f79..28c72f3b36 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -1,4 +1,12 @@
 $(document).ready(function () {
+    const BC_PERMANENT_DST_ZONE = 'UTC-7';
+    // Close dropdown menus when clicking outside
+    $(document).on('click', function (e) {
+        if (!$(e.target).closest('.tinymce-menu-button, .custom-dropdown-menu').length) {
+            $('.custom-dropdown-menu').remove();
+        }
+    });
+
     const UIElements = {
         applicationId: $('#DetailsViewApplicationId')[0].value,
         btnSend: $('#btn-send-top'),
@@ -10,6 +18,13 @@
         btnCancelEmail: $('#btn-cancel-email'),
         btnNewEmail: $('#btn-new-email'),
         btnShowBCC: $('#btn-show-bcc'),
+        btnEmailTypeMail: $('#email-type-mail'),
+        btnEmailTypeTemplate: $('#email-type-template'),
+        templateModalBackdrop: $('#template-modal-backdrop'),
+        templateModal: $('#template-selection-modal'),
+        templateSelectionDropdown: $('#TemplateSelectionDropdown'),
+        btnTemplateCancel: $('#btn-template-cancel'),
+        btnTemplateModalClose: $('#btn-template-modal-close'),
         emailForm: $('#EmailForm'),
         inputEmailId: $('#EmailId'),
         inputEmailTo: $($('#EmailTo')[0]),
@@ -62,6 +77,10 @@
     let newDraftId = null;
     let selectedEmailData = null; // Store original email data when selected from table
     let emailAttachmentsTable = null;
+    let activeTemplateId = null; // Track if a template has been applied to the current draft
+    let originalTemplateState = { name: '', id: '' }; // Baseline template for discard restore
+    let activeTemplateAttachmentCount = 0; // Track how many attachments were copied from the active template
+    let isApplicationEmailContext = true; // Flag to track if we're in application email or template preview context
     let scheduleState = {
         currentMonth: new Date().getMonth(),
         currentYear: new Date().getFullYear(),
@@ -79,11 +98,16 @@
         UIElements.btnSendClose.off('click');
         UIElements.btnConfirmSend.off('click');
         UIElements.btnCancelEmail.off('click');
+        UIElements.btnTemplateCancel.off('click');
+        UIElements.btnTemplateModalClose.off('click');
         $('.btn-send-menu').off('click');
         $('.btn-schedule-send-menu').off('click');
 
         // Bind button handlers
-        UIElements.btnNewEmail.on('click', handleNewEmail);
+        UIElements.btnNewEmail.on('click', function (e) {
+            e.preventDefault();
+            handleNewEmail(false);
+        });
         UIElements.btnSend.on('click', handleSendEmail);
         UIElements.btnSave.on('click', handleSaveEmail);
         UIElements.btnDiscard.on('click', handleDiscardEmail);
@@ -107,6 +131,9 @@
 
         UIElements.btnConfirmSend.on('click', handleConfirmSendEmail);
         UIElements.btnCancelEmail.on('click', handleCancelEmailSend);
+        UIElements.btnTemplateCancel.on('click', closeTemplateSelectionModal);
+        UIElements.btnTemplateModalClose.on('click', closeTemplateSelectionModal);
+        UIElements.templateSelectionDropdown.on('change', handleTemplateSelection);
         UIElements.inputEmailSubject.on('change', handleKeyUpTrim);
         UIElements.inputEmailFrom.on('change', handleKeyUpTrim);
         UIElements.inputEmailCC.on('change', handleKeyUpTrim);
@@ -139,11 +166,17 @@
         });
 
         UIElements.inputEmailTo.on('input', handleDraftChange);
+        UIElements.inputEmailTo.on('change', handleDraftChange);
         UIElements.inputEmailCC.on('input', handleDraftChange);
+        UIElements.inputEmailCC.on('change', handleDraftChange);
         UIElements.inputEmailBCC.on('input', handleDraftChange);
+        UIElements.inputEmailBCC.on('change', handleDraftChange);
         UIElements.inputEmailFrom.on('input', handleDraftChange);
+        UIElements.inputEmailFrom.on('change', handleDraftChange);
         UIElements.inputEmailSubject.on('input', handleDraftChange);
+        UIElements.inputEmailSubject.on('change', handleDraftChange);
         UIElements.inputEmailBody.on('input', handleDraftChange);
+        UIElements.inputEmailBody.on('change', handleDraftChange);
 
         // BCC button and input handlers
         UIElements.btnShowBCC.on('click', handleShowBCC);
@@ -332,7 +365,7 @@
                 UIElements.scheduleDateValidation.hide();
             }
         });
-    
+
         UIElements.scheduleDateInput.on('blur', function () {
             validateScheduleDate();
         });
@@ -457,8 +490,8 @@
         // Pre-populate with existing value if set, otherwise default to today
         const existing = UIElements.inputSendOnDateTime.val();
         if (existing) {
-            const existingDate = new Date(existing);
-            const bcPstDate = new Date(existingDate.toLocaleString('en-US', { timeZone: 'America/Vancouver' }));
+            const existingDateTime = luxon.DateTime.fromISO(existing, { zone: 'utc' }).setZone(BC_PERMANENT_DST_ZONE);
+            const bcPstDate = existingDateTime.isValid ? existingDateTime.toJSDate() : new Date(existing);
             state.selectedDate = bcPstDate;
             state.currentMonth = bcPstDate.getMonth();
             state.currentYear = bcPstDate.getFullYear();
@@ -511,14 +544,31 @@
             return; // Keep modal open on validation error
         }
 
-        // Combine date and time
+        // Build selected date/time in BC Pacific timezone.
         const [hours, minutes] = state.selectedTime.split(':').map(Number);
-        const bcPstDate = new Date(state.selectedDate);
-        bcPstDate.setHours(hours, minutes, 0, 0);
+        const bcSelection = luxon.DateTime.fromObject(
+            {
+                year: state.selectedDate.getFullYear(),
+                month: state.selectedDate.getMonth() + 1,
+                day: state.selectedDate.getDate(),
+                hour: hours,
+                minute: minutes,
+                second: 0,
+                millisecond: 0
+            },
+            { zone: BC_PERMANENT_DST_ZONE }
+        );
+
+        if (!bcSelection.isValid) {
+            const errorMsg = 'Invalid date/time selection.';
+            UIElements.scheduleModalValidation.text(errorMsg).show();
+            showValidationErrorToast([errorMsg]);
+            return;
+        }
 
         // Validate future date/time
-        const now = new Date();
-        if (bcPstDate <= now) {
+        const now = luxon.DateTime.now().setZone(BC_PERMANENT_DST_ZONE);
+        if (bcSelection <= now) {
             const errorMsg = 'Please select a future date and time.';
             UIElements.scheduleModalValidation.text(errorMsg).show();
             showValidationErrorToast([errorMsg]);
@@ -527,43 +577,22 @@
 
         // Validate max date (50 years from today)
         const maxDate = getMaxScheduleDate();
-        if (bcPstDate > maxDate) {
+        if (bcSelection.toJSDate() > maxDate) {
             const errorMsg = 'Please select a date within 50 years from today.';
             UIElements.scheduleModalValidation.text(errorMsg).show();
             showValidationErrorToast([errorMsg]);
             return; // Keep modal open on validation error
         }
 
-        // Convert BC PST time to UTC ISO string
-        // First, get the offset between BC PST and UTC
-        const formatter = new Intl.DateTimeFormat('en-US', {
-            timeZone: 'America/Vancouver',
-            year: 'numeric', month: '2-digit', day: '2-digit',
-            hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false
-        });
-
-        const bcPstString = formatter.format(bcPstDate);
-        const [datePart, timePart] = bcPstString.split(',');
-        const [m, d, y] = datePart.trim().split('/');
-        const [h, min, s] = timePart.trim().split(':');
-
-        // Create a local date from the user-entered components (not UTC)
-        const localDate = new Date(Number.parseInt(y), Number.parseInt(m) - 1, Number.parseInt(d), Number.parseInt(h), Number.parseInt(min), Number.parseInt(s));
-
-        // Convert local time to UTC for storage
-        const utcDate = new Date(localDate.getTime() - localDate.getTimezoneOffset() * 60000);
-        const utcIso = utcDate.toISOString();
+        // Convert BC Pacific wall time to UTC for storage/submission.
+        const utcIso = bcSelection.toUTC().toISO({ suppressMilliseconds: true });
 
         // Commit to hidden field
         UIElements.inputSendOnDateTime.val(utcIso);
 
-        // Display as local time (no timezone conversion needed since we're storing as UTC)
-        const formattedDate = localDate.toLocaleDateString('en-CA'); // YYYY-MM-DD format
-        const formattedTime = localDate.toLocaleTimeString('en-US', {
-            hour: 'numeric',
-            minute: '2-digit',
-            hour12: true
-        });
+        // Display in BC Pacific timezone.
+        const formattedDate = bcSelection.toFormat('yyyy-MM-dd');
+        const formattedTime = bcSelection.toFormat('h:mm a');
         UIElements.sendOnDisplay.text(`${formattedDate}, ${formattedTime}`);
         UIElements.btnClearSchedule.show();
         $('#scheduled-label-container').addClass('show');
@@ -577,15 +606,13 @@
     function updateScheduledDateDisplay() {
         const dateTimeValue = UIElements.inputSendOnDateTime.val();
         if (dateTimeValue) {
-            // Parse the ISO string and format as local time without timezone conversion
-            const date = new Date(dateTimeValue);
-            const formattedDate = date.toLocaleDateString('en-CA'); // YYYY-MM-DD format
-            const formattedTime = date.toLocaleTimeString('en-US', {
-                hour: 'numeric',
-                minute: '2-digit',
-                hour12: true
-            });
-            UIElements.sendOnDisplay.text(`${formattedDate}, ${formattedTime}`);
+            // Stored value is UTC; render in BC Pacific timezone.
+            const dt = luxon.DateTime.fromISO(dateTimeValue, { zone: 'utc' }).setZone(BC_PERMANENT_DST_ZONE);
+            if (dt.isValid) {
+                UIElements.sendOnDisplay.text(`${dt.toFormat('yyyy-MM-dd')}, ${dt.toFormat('h:mm a')}`);
+            } else {
+                UIElements.sendOnDisplay.text('');
+            }
             UIElements.btnClearSchedule.show();
             $('#scheduled-label-container').addClass('show');
             $('#scheduled-delay-section').show();
@@ -631,6 +658,7 @@
 
         $('#modal-content, #modal-background').removeClass('active');
         UIElements.emailForm.removeClass('active');
+        $('#EmailTemplateName').val('');
         UIElements.btnNewEmail.removeClass('hide');
         UIElements.alertEmailReadonly.removeClass('hide');
         UIElements.emailForm.trigger("reset");
@@ -659,6 +687,9 @@
             isNewEmailDraft = false;
             newDraftId = null;
         }
+        activeTemplateId = null;
+        originalTemplateState = { name: '', id: '' };
+        activeTemplateAttachmentCount = 0;
         closeEmailFormUI();
     }
 
@@ -692,6 +723,10 @@
                     UIElements.inputOriginalEmailBody.val('');
                     // Clear template
                     $('#EmailTemplate').val('').trigger('change');
+                    $('#EmailTemplateName').val('');
+                    activeTemplateId = null;
+                    originalTemplateState = { name: '', id: '' };
+                    updateSelectedTemplateLabel('', '');
                     // Reset scheduled send
                     clearScheduleValue();
                     // Reset validation errors
@@ -730,6 +765,10 @@
                     UIElements.inputOriginalEmailBody.val('');
                     // Clear template
                     $('#EmailTemplate').val('').trigger('change');
+                    $('#EmailTemplateName').val('');
+                    activeTemplateId = null;
+                    originalTemplateState = { name: '', id: '' };
+                    updateSelectedTemplateLabel('', '');
                     // Reset scheduled send
                     clearScheduleValue();
                     // Reset validation errors
@@ -742,15 +781,22 @@
         } else {
             // Reset existing email to stored original data
             if (selectedEmailData) {
+                const originalTemplateName = originalTemplateState.name;
+                const originalTemplateId = originalTemplateState.id;
+
                 UIElements.inputEmailTo.val(selectedEmailData.toAddress);
                 UIElements.inputEmailCC.val(selectedEmailData.cc?.replaceAll(',', '; ') ?? '');
                 UIElements.inputEmailBCC.val(selectedEmailData.bcc?.replaceAll(',', '; ') ?? '');
                 UIElements.inputEmailFrom.val(selectedEmailData.fromAddress);
                 UIElements.inputEmailSubject.val(selectedEmailData.subject);
                 UIElements.inputEmailBody.val(refreshTodayDateSpans(selectedEmailData.body));
+                $('#EmailTemplateName').val(originalTemplateName);
+                activeTemplateId = originalTemplateId || null;
+                updateSelectedTemplateLabel(originalTemplateName, originalTemplateId);
 
                 // Reset TinyMCE editor
-                tinymce.get("EmailBody")?.setContent(refreshTodayDateSpans(selectedEmailData.body));
+                const resetBodyContent = selectedEmailData.body ? refreshTodayDateSpans(selectedEmailData.body) : '';
+                tinymce.get("EmailBody")?.setContent(resetBodyContent || '');
 
                 // Reset scheduled send date/time to original state
                 if (selectedEmailData.sendOnDateTime) {
@@ -767,9 +813,13 @@
                 UIElements.inputEmailFrom.val(UIElements.inputOriginalEmailFrom.val());
                 UIElements.inputEmailSubject.val(UIElements.inputOriginalEmailSubject.val());
                 UIElements.inputEmailBody.val(UIElements.inputOriginalEmailBody.val());
+                $('#EmailTemplateName').val(originalTemplateState.name || '');
+                activeTemplateId = originalTemplateState.id || null;
+                updateSelectedTemplateLabel(originalTemplateState.name || '', originalTemplateState.id || '');
 
                 // Reset TinyMCE editor
-                tinymce.get("EmailBody")?.setContent(UIElements.inputOriginalEmailBody.val());
+                const fallbackBodyContent = UIElements.inputOriginalEmailBody.val() || '';
+                tinymce.get("EmailBody")?.setContent(fallbackBodyContent);
 
                 // Reset scheduled send date/time to original state
                 clearScheduleValue();
@@ -818,6 +868,375 @@
         });
     }
 
+    function closeTemplateSelectionModal() {
+        UIElements.templateModalBackdrop.hide();
+        UIElements.templateModal.hide();
+        UIElements.templateSelectionDropdown.val('');
+    }
+
+    async function copyTemplateAttachments(templateId, emailLogId) {
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/email-template/${templateId}/copy-attachments`,
+                type: 'POST',
+                data: JSON.stringify({ emailLogId: emailLogId }),
+                contentType: 'application/json'
+            });
+            return response?.attachmentCount || 0;
+        } catch (e) {
+            console.warn('Failed to copy template attachments:', e);
+            return 0;
+        }
+    }
+
+    async function deleteOriginAttachments(emailLogId) {
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/email-log/${emailLogId}/origin-attachments`,
+                type: 'DELETE'
+            });
+            return response?.attachmentCount || 0;
+        } catch (e) {
+            console.warn('Failed to delete origin attachments:', e);
+            return 0;
+        }
+    }
+
+    function populateTemplatesSelectOptions($select, templates) {
+        const $placeholder = $select.find('option[value=""]').first();
+
+        // Always rebuild non-placeholder options to avoid duplicate entries.
+        $select.find('option').not($placeholder).remove();
+
+        const seenTemplateIds = new Set();
+        templates.forEach((template) => {
+            const templateName = template.name || template.Name || 'Unnamed Template';
+            const templateId = (template.id || template.Id || '').toString();
+            if (!templateId || seenTemplateIds.has(templateId)) {
+                return;
+            }
+
+            seenTemplateIds.add(templateId);
+
+            const $option = $('<option>')
+                .val(templateId)
+                .text(templateName);
+
+            if (activeTemplateId && templateId === activeTemplateId.toString()) {
+                $option.prop('selected', true);
+            }
+
+            $option.appendTo($select);
+        });
+    }
+
+    function hasLoadedTemplateOptions($select) {
+        return $select.find('option').toArray().some(option => {
+            return ($(option).val() || '').toString().trim() !== '';
+        });
+    }
+
+    async function ensureTemplatesSelectOptionsLoaded($select) {
+        if (hasLoadedTemplateOptions($select)) {
+            return;
+        }
+
+        const templates = await $.ajax({
+            url: `/api/form-notifications/templates`,
+            type: 'GET'
+        });
+
+        if (templates?.length > 0) {
+            populateTemplatesSelectOptions($select, templates);
+        }
+    }
+
+    function updateSelectedTemplateLabel(templateName, templateId) {
+        const normalizedTemplateName = normalizeTemplateName(templateName);
+        const dropdownLabel = normalizedTemplateName || 'Templates';
+        const selectedTemplateValue = (templateId || activeTemplateId || '').toString();
+
+        const $templateNameInput = $('#EmailTemplateName');
+        if ($templateNameInput.length) {
+            $templateNameInput.val(normalizedTemplateName);
+        }
+
+        // Keep the disabled placeholder option text in sync with the selected template.
+        $('.templates-select').each(function () {
+            const $select = $(this);
+            let $placeholder = $select.find('option[value=""]').first();
+
+            if (!$placeholder.length) {
+                $placeholder = $('<option>')
+                    .val('')
+                    .prependTo($select);
+            }
+
+            $placeholder
+                .text(dropdownLabel)
+                .prop('disabled', true)
+                .prop('hidden', true);
+
+            // Never delete template options; hide only the currently selected one.
+            // This avoids list shrinking and allows previously selected options to reappear.
+            $select.find('option').not($placeholder).each(function () {
+                const $option = $(this);
+                const optionText = ($option.text() || '').trim();
+                const optionValue = ($option.val() || '').toString();
+                const matchesByValue = !!selectedTemplateValue && optionValue === selectedTemplateValue;
+                const matchesByName = !!normalizedTemplateName && optionText === normalizedTemplateName;
+
+                $option.prop('hidden', matchesByValue || matchesByName);
+            });
+
+            if (!$select.val()) {
+                $placeholder.prop('selected', true);
+            }
+        });
+
+        const $labelContainer = (typeof getSelectedTemplateLabelContainer === 'function')
+            ? getSelectedTemplateLabelContainer()
+            : $('.selected-template-label-container').first();
+
+        if (!$labelContainer.length) {
+            return;
+        }
+
+        const $existingLabel = $labelContainer.find('.template-label-text');
+
+        if (!normalizedTemplateName) {
+            $existingLabel.remove();
+            return;
+        }
+
+        if ($existingLabel.length) {
+            $existingLabel.html(`📄 ${$('<div>').text(normalizedTemplateName).html()}`);
+            return;
+        }
+
+        const hasPermission = abp.auth.isGranted('SettingManagement.Notifications');
+        const $templateLabel = $('<button type="button">')
+            .addClass('template-label-text')
+            .html(`📄 ${$('<div>').text(normalizedTemplateName).html()}`);
+
+        if (!hasPermission) {
+            $templateLabel.addClass('no-permission');
+        }
+
+        if (hasPermission) {
+            $templateLabel.attr('title', 'Open template in settings')
+                .on('click', async function (e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    localStorage.setItem('ConfigurationManagement_ActiveMenu', 'notifications-menu-item');
+                    localStorage.setItem('notifications-active-tab', 'nav-template-tab');
+                    localStorage.setItem('notifications-template-to-select', templateId || activeTemplateId || '');
+                    await new Promise(resolve => setTimeout(resolve, 50));
+                    window.location.href = '/ConfigurationManagement';
+                });
+        }
+
+        $labelContainer.empty().append($templateLabel);
+    }
+
+    function resolveTemplateRecipientEmails(template) {
+        if (!template) {
+            return '';
+        }
+
+        const directRecipients = [
+            template.emailTo,
+            template.EmailTo,
+            template.toAddress,
+            template.ToAddress,
+            template.to,
+            template.To
+        ].find(value => typeof value === 'string' && value.trim());
+
+        if (directRecipients) {
+            return directRecipients.trim();
+        }
+
+        const recipientCategory = (template.recipientCategory || template.RecipientCategory || '').trim().toLowerCase();
+        const recipientIdentifier = (template.recipientIdentifier || template.RecipientIdentifier || '').trim();
+        if (!recipientIdentifier) {
+            return '';
+        }
+
+        const identifiers = recipientIdentifier
+            .split(',')
+            .map(value => value.trim())
+            .filter(Boolean);
+
+        const emails = new Set();
+        identifiers.forEach((identifier) => {
+            if (validateEmail(identifier)) {
+                emails.add(identifier);
+                return;
+            }
+
+            if (recipientCategory === 'external') {
+                if (identifier.toLowerCase() === 'applicationcontact' && applicationDetails?.contactEmail) {
+                    emails.add(applicationDetails.contactEmail);
+                }
+
+                if (identifier.toLowerCase() === 'signingauthority' && applicationDetails?.signingAuthorityEmail) {
+                    emails.add(applicationDetails.signingAuthorityEmail);
+                }
+            }
+        });
+
+        return Array.from(emails).join('; ');
+    }
+
+    async function resolveTemplateRecipientEmailsFromApi(template, templateId) {
+        const localRecipients = resolveTemplateRecipientEmails(template);
+        const resolvedTemplateId = (templateId || template?.id || template?.Id || '').toString().trim();
+        const applicationId = (UIElements.applicationId || '').toString().trim();
+
+        if (!resolvedTemplateId) {
+            return localRecipients;
+        }
+
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/templates/${resolvedTemplateId}/resolved-recipients`,
+                type: 'GET',
+                data: applicationId ? { applicationId } : {}
+            });
+
+            const apiRecipients = (response?.emailTo || response?.EmailTo || '').trim();
+            return apiRecipients || localRecipients;
+        } catch (e) {
+            console.warn('Failed to resolve template recipients from API, using local fallback:', e);
+            return localRecipients;
+        }
+    }
+
+    async function handleTemplateSelection() {
+        const selectedTemplateId = UIElements.templateSelectionDropdown.val();
+
+        if (!selectedTemplateId) {
+            return;
+        }
+
+        closeTemplateSelectionModal();
+
+        try {
+            // Load all templates and find the selected one
+            const response = await $.ajax({
+                url: `/api/form-notifications/templates`,
+                type: 'GET'
+            });
+
+            console.log('API Response:', response);
+            console.log('Selected Template ID:', selectedTemplateId);
+
+            // Try to find template with either camelCase or PascalCase property names
+            let selectedTemplate = response.find(t => t.id === selectedTemplateId);
+            let useUpperCase = false;
+
+            if (!selectedTemplate) {
+                console.warn('Template not found with camelCase, checking with PascalCase...');
+                console.log('Available template IDs:', response.map(t => t.id || t.Id));
+                selectedTemplate = response.find(t => t.Id === selectedTemplateId);
+                useUpperCase = true;
+            }
+
+            if (!selectedTemplate) {
+                abp.notify.error('Selected template not found.');
+                return;
+            }
+
+            console.log('Selected template:', selectedTemplate);
+
+            // Get property values with fallback for case differences
+            const subject = useUpperCase ? selectedTemplate.Subject : selectedTemplate.subject;
+            let body = useUpperCase ? (selectedTemplate.Body || selectedTemplate.BodyHTML) : (selectedTemplate.body || selectedTemplate.bodyHTML);
+            const sendFrom = useUpperCase ? selectedTemplate.SendFrom : selectedTemplate.sendFrom;
+
+            console.log('Template values - Subject:', subject, 'Body length:', body?.length, 'SendFrom:', sendFrom);
+
+            // Process template variables using Handlebars if applicationDetails is available
+            if (body && applicationDetails && mappingConfig) {
+                try {
+                    const templateData = extractTemplateData(applicationDetails, mappingConfig);
+                    const template = Handlebars.compile(body);
+                    body = template(templateData);
+                    console.log('Template variables replaced, rendered body length:', body?.length);
+                } catch (e) {
+                    console.warn('Failed to process template variables:', e);
+                    // Continue with unprocessed body if Handlebars fails
+                }
+            } else {
+                console.log('Handlebars processing skipped - applicationDetails or mappingConfig not available');
+            }
+
+            const templateName = useUpperCase ? selectedTemplate.Name : selectedTemplate.name;
+            const templateRecipients = await resolveTemplateRecipientEmailsFromApi(selectedTemplate, selectedTemplateId);
+
+            // If an email draft is already open, show confirmation before re-applying a template
+            if (newDraftId) {
+                let confirmMessage = 'Any changes to the email will be reverted to the template defaults.';
+                if (activeTemplateAttachmentCount > 0) {
+                    confirmMessage += `\n\nThe ${activeTemplateAttachmentCount} attachment${activeTemplateAttachmentCount === 1 ? '' : 's'} copied from the previous template will also be removed.`;
+                }
+                const confirm = await Swal.fire({
+                    title: 'Apply Template?',
+                    text: confirmMessage,
+                    icon: 'warning',
+                    showCancelButton: true,
+                    confirmButtonText: 'Apply Template',
+                    cancelButtonText: 'Cancel'
+                });
+                if (!confirm.isConfirmed) {
+                    return;
+                }
+                // Remove previous template attachments if any
+                if (activeTemplateAttachmentCount > 0) {
+                    await deleteOriginAttachments(newDraftId);
+                    activeTemplateAttachmentCount = 0;
+                    if (emailAttachmentsTable) {
+                        emailAttachmentsTable.ajax.reload();
+                    }
+                }
+            }
+
+            // Initialize email with template data
+            const draftId = await handleNewEmail(true, subject, body, sendFrom, templateName, selectedTemplateId);
+            activeTemplateId = selectedTemplateId;
+            activeTemplateAttachmentCount = 0;
+            updateSelectedTemplateLabel(templateName, selectedTemplateId);
+            if (templateRecipients) {
+                UIElements.inputEmailTo.val(templateRecipients).trigger('change');
+                UIElements.inputOriginalEmailTo.val(templateRecipients);
+            }
+
+            // Copy template attachments to the email log
+            const attachmentCount = await copyTemplateAttachments(selectedTemplateId, draftId);
+            activeTemplateAttachmentCount = attachmentCount;
+
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+
+            await Swal.fire({
+                title: 'Template Applied',
+                text: attachmentCount > 0
+                    ? `${attachmentCount} attachment${attachmentCount === 1 ? '' : 's'} from the template ${attachmentCount === 1 ? 'has' : 'have'} been copied to this email.`
+                    : 'Template applied successfully. No attachments were copied.',
+                icon: 'success',
+                confirmButtonText: 'OK'
+            });
+        } catch (e) {
+            console.error('Failed to load template - Full error:', e);
+            console.error('Response text:', e.responseText);
+            console.error('Status:', e.status);
+            abp.notify.error('Failed to load template. Please try again.');
+        }
+    }
+
+
     function handleShowBCC() {
         // Show BCC input row and hide the button
         UIElements.bccInputRow.addClass('show');
@@ -839,18 +1258,30 @@
         }
     }
 
-    async function handleNewEmail() {
+    async function handleNewEmail(fromTemplate = false, templateSubject = '', templateBody = '', templateFrom = '', templateName = '', templateId = '') {
+        // Set context flag - if loaded from template, it's not application email context
+        isApplicationEmailContext = !fromTemplate;
+
+        // Update body class for CSS visibility control
+        if (isApplicationEmailContext) {
+            document.body.classList.add('application-email-context');
+        } else {
+            document.body.classList.remove('application-email-context');
+        }
+
         isViewingDraft = true; // New emails are drafts
         resetEmailBody();
-        $('#templateListContainer').show();
-        $('#templateTextContainer').hide();
-        $('#EmailTemplate').prop('disabled', false);
+        const normalizedTemplateName = normalizeTemplateName(templateName);
+        const normalizedTemplateId = (templateId || '').toString();
+        $('#EmailTemplateName').val(normalizedTemplateName);
+        originalTemplateState = { name: normalizedTemplateName, id: normalizedTemplateId };
+        activeTemplateId = normalizedTemplateId || null;
         UIElements.inputOriginalEmailTo.val(defaultValues.emailTo);
         UIElements.inputOriginalEmailCC.val(defaultValues.emailCC);
         UIElements.inputOriginalEmailBCC.val(defaultValues.emailBCC);
         UIElements.inputOriginalEmailFrom.val(defaultValues.emailFrom);
-        UIElements.inputOriginalEmailSubject.val("");
-        UIElements.inputOriginalEmailBody.val("");
+        UIElements.inputOriginalEmailSubject.val(templateSubject);
+        UIElements.inputOriginalEmailBody.val(templateBody);
 
         try {
             const draftId = await initializeDraft(UIElements.applicationId);
@@ -865,11 +1296,19 @@
 
         tinymce.get("EmailBody")?.remove();
 
+        console.log('Initializing TinyMCE with template body:', templateBody?.substring(0, 50) + '...');
+
+        // Show modal FIRST so element is in DOM
+        UIElements.inputEmailSubject.val(templateSubject);
+        UIElements.inputEmailFrom.val(templateFrom || defaultValues.emailFrom);
+        showModalEmail();
+
+        // Then initialize TinyMCE
         tinymce.init({
             license_key: 'gpl',
             selector: '#EmailBody',
             plugins: getPlugins(),
-            toolbar: getToolbarOptions(),
+            menubar: 'file edit view insert format tools',
             resize: true,
             statusbar: true,
             elementpath: false,
@@ -879,21 +1318,111 @@
             skin: false,
             ui_container: '.details-scrollable',
             setup: function (editor) {
+                // Register Variables menu button - only in TEMPLATE context (not application)
+                if (!isApplicationEmailContext) {
+                    registerVariablesMenuButton(editor);
+                }
+
                 editor.on("input", (e) => {
                     UIElements.inputEmailBody.val(editor.getContent());
                     handleDraftChange();
                 });
                 editorInstance = editor;
-                editorInstance.setContent('');
+            },
+            init_instance_callback: function (editor) {
+                console.log('TinyMCE init_instance_callback - editor ready, setting content');
+                console.log('Template body:', templateBody);
+                try {
+                    if (templateBody) {
+                        const sanitizedTemplateBody = sanitizeTinyMceHtml(templateBody);
+                        editor.setContent(sanitizedTemplateBody, { format: 'html' });
+                        console.log('Content set successfully. Editor content now:', editor.getContent().substring(0, 50));
+                        UIElements.inputEmailBody.val(sanitizedTemplateBody);
+                    } else {
+                        console.warn('Template body is empty');
+                        editor.setContent('');
+                    }
+                } catch (e) {
+                    console.error('Error setting TinyMCE content:', e);
+                }
+
+                // Create label/button container unconditionally
+                setTimeout(() => {
+                    const $menubar = $(editor.getContainer()).find('.tox-menubar');
+                    if (!$menubar.length) return;
+
+                    updateSelectedTemplateLabel(templateName, templateId);
+
+                    // Templates button - add to TinyMCE menu bar at bottom
+                    if (!$menubar.find('.templates-button-container').length) {
+                        // Create select element for templates
+                        const $templatesSelect = $('<select>')
+                            .addClass('templates-select templates-button-container')
+                            .attr('title', 'Select a template to apply');
+
+                        // Keep "Templates" as the control label, but not as a selectable option.
+                        $('<option>')
+                            .val('')
+                            .text('Templates')
+                            .prop('selected', true)
+                            .prop('disabled', true)
+                            .prop('hidden', true)
+                            .appendTo($templatesSelect);
+
+
+                        // Load templates and populate select
+                        $templatesSelect.on('change', async function () {
+                            const selectedTemplateId = $(this).val();
+
+                            if (!selectedTemplateId) {
+                                return;
+                            }
+
+                            // Reset select to default
+                            $(this).val('');
+
+                            try {
+                                const response = await $.ajax({
+                                    url: `/api/form-notifications/templates`,
+                                    type: 'GET'
+                                });
+
+                                const template = response.find(t => t.id === selectedTemplateId || t.Id === selectedTemplateId);
+
+                                if (template) {
+                                    await applyTemplateToEmail(template);
+                                } else {
+                                    abp.notify.error('Template not found.');
+                                }
+                            } catch (e) {
+                                console.error('Failed to apply template:', e);
+                                abp.notify.error('Failed to apply template.');
+                            }
+                        });
+
+                        // Load templates lazily when opened.
+                        $templatesSelect.on('click', async function (e) {
+                            try {
+                                await ensureTemplatesSelectOptionsLoaded($(this));
+                            } catch (err) {
+                                console.error('Failed to load templates:', err);
+                                abp.notify.error('Failed to load templates.');
+                            }
+                        });
+
+                        $menubar.append($templatesSelect);
+                    }
+                }, 0);  // setTimeout for rendering after editor init
             }
         });
 
         $('#email-attachments-section').show();
         $('#email_attachment_upload_btn').show();
         initEmailAttachmentsTable(UIElements.inputEmailId.val(), true);
-        handleDraftChange();
-        showModalEmail();
         resetValidationErrors();
+
+        // Return the draft ID so it can be used by the caller (e.g., for copying template attachments)
+        return newDraftId;
     }
 
     function showModalEmail() {
@@ -923,20 +1452,12 @@
         return suppressToast ? result : result.isValid; // For backward compatibility
     }
 
-
     function handleConfirmSendEmail() {
         UIElements.confirmationModal.hide();
         UIElements.emailSpinner.show();
-        let templateName = '';
-        if (isNewEmailDraft) {
-            templateName = $("#EmailTemplate option:selected").text().trim();
-            // Check for all placeholder variations
-            if (!templateName || templateName === '' || templateName === 'Please select' || templateName === 'Select a template' || templateName.toLowerCase().includes('select')) {
-                templateName = "No Template Selected";
-            }
-        } else {
-            templateName = $('#EmailTemplateName').val();
-        }
+        const templateName =
+            normalizeTemplateName($('#EmailTemplateName').val()) ||
+            normalizeTemplateName($("#EmailTemplate option:selected").text());
 
         const rawDateTime = UIElements.inputSendOnDateTime.length ? UIElements.inputSendOnDateTime.val() : '';
         // Hidden field already holds the UTC ISO string set when the modal was confirmed.
@@ -1012,17 +1533,9 @@
                 return;
             }
 
-            let templateName = '';
-            // Check the dropdown for the current selection (handles both new and edited drafts)
-            const selectedTemplate = $("#EmailTemplate option:selected").text().trim();
-            if (selectedTemplate && selectedTemplate !== '' && selectedTemplate !== 'Please select' && selectedTemplate !== 'Select a template' && !selectedTemplate.toLowerCase().includes('select')) {
-                templateName = selectedTemplate;
-            } else if (isNewEmailDraft) {
-                templateName = "No Template Selected";
-            } else {
-                // For existing drafts without a valid template selected, keep the original
-                templateName = $('#EmailTemplateName').val();
-            }
+            const templateName =
+                normalizeTemplateName($('#EmailTemplateName').val()) ||
+                normalizeTemplateName($("#EmailTemplate option:selected").text());
 
             UIElements.btnSave.prop('disabled', true);
 
@@ -1090,6 +1603,8 @@
         return validationResult;
     }
 
+    globalThis.validateEmailField = validateEmailField;
+
     function clearFieldErrors(fieldElement) {
         let errorSpan = $(`span[data-valmsg-for*='${fieldElement.name}']`)[0];
         if (errorSpan) {
@@ -1106,8 +1621,8 @@
         if (!errorSpan) {
             errorSpan = document.createElement('span');
             errorSpan.className = 'field-validation-valid';
-            errorSpan.dataset.valmsigFor = fieldName;
-            errorSpan.dataset.valmsigReplace = 'true';
+            errorSpan.dataset.valmsgFor = fieldName;
+            errorSpan.dataset.valmsgReplace = 'true';
             fieldElement.parentNode.appendChild(errorSpan);
         }
         return errorSpan;
@@ -1185,15 +1700,6 @@
         e.stopPropagation();
         e.preventDefault();
 
-        // Collect all errors without showing toasts immediately
-        let toResult = validateEmailTo(true); // suppressToast = true
-        let ccResult = validateEmailCC(true);
-        let bccResult = validateEmailBCC(true);
-        let allErrors = collectEmailFieldErrors(toResult, ccResult, bccResult);
-
-        console.log('Email field validation results:', { toResult, ccResult, bccResult });
-        console.log('Collected email errors:', allErrors);
-
         // Sync TinyMCE content to textarea BEFORE running jQuery validation
         if (editorInstance) {
             UIElements.inputEmailBody.val(editorInstance.getContent());
@@ -1207,6 +1713,15 @@
         let fieldName = 'EmailBody';
         let errorList = validator.errorList;
 
+        // Run custom email validations after jQuery validation so jQuery does not clear custom field errors.
+        let toResult = validateEmailTo(true); // suppressToast = true
+        let ccResult = validateEmailCC(true);
+        let bccResult = validateEmailBCC(true);
+        let allErrors = collectEmailFieldErrors(toResult, ccResult, bccResult);
+
+        console.log('Email field validation results:', { toResult, ccResult, bccResult });
+        console.log('Collected email errors:', allErrors);
+
         // Get TinyMCE content and check validation state
         let tinymceContent = getTinyMceContent();
         let onlyErrorIsTinyMCE = checkOnlyErrorIsTinyMCE(isValid, errorList, fieldName, tinymceContent);
@@ -1238,12 +1753,16 @@
     }
 
     function checkDraftChanges() {
+        const currentTemplateName = normalizeTemplateName($('#EmailTemplateName').val());
+        const originalTemplateName = normalizeTemplateName(originalTemplateState.name);
+
         return UIElements.inputEmailTo.val() !== UIElements.inputOriginalEmailTo.val() ||
             UIElements.inputEmailCC.val() !== UIElements.inputOriginalEmailCC.val() ||
             UIElements.inputEmailBCC.val() !== UIElements.inputOriginalEmailBCC.val() ||
             UIElements.inputEmailFrom.val() !== UIElements.inputOriginalEmailFrom.val() ||
             UIElements.inputEmailSubject.val() !== UIElements.inputOriginalEmailSubject.val() ||
-            UIElements.inputEmailBody.val() !== UIElements.inputOriginalEmailBody.val();
+            UIElements.inputEmailBody.val() !== UIElements.inputOriginalEmailBody.val() ||
+            currentTemplateName !== originalTemplateName;
     }
 
     function resetValidationErrors() {
@@ -1266,7 +1785,9 @@
             const renderedHtml = template(templateData);
             $('#EmailFrom').val(templateDetails.sendFrom)
             $('#EmailSubject').val(templateDetails.subject)
-            editorInstance.setContent(renderedHtml);
+            if (renderedHtml) {
+                editorInstance.setContent(renderedHtml);
+            }
 
             // Only enable save button if we're viewing a draft
             if (isViewingDraft) {
@@ -1366,7 +1887,7 @@
 
     const buildTodayDateHtml = () => {
         const formatted = new Intl.DateTimeFormat('en-CA', {
-            timeZone: 'America/Vancouver',
+            timeZone: 'Etc/GMT+7',
             year: 'numeric',
             month: 'long',
             day: 'numeric'
@@ -1382,6 +1903,15 @@
         );
     };
 
+    function registerVariablesMenuButton(editor) {
+        editor.ui.registry.addMenuButton('variablesButton', {
+            text: 'Variables',
+            fetch: (callback) => {
+                callback(buildVariablesMenuItems(mappingConfig, editor));
+            }
+        });
+    }
+
     function extractTemplateData(apiResponse, mappingConfig) {
         const templateData = {};
 
@@ -1402,14 +1932,110 @@
         return templateData;
     }
 
+    // Helper function to apply a template to the current email
+    async function applyTemplateToEmail(template) {
+        try {
+            // Get the current email ID from the form field
+            const currentEmailId = UIElements.inputEmailId.val();
+
+            // Show confirmation dialog
+            let confirmMessage = 'Selecting a template will revert any changes made to this email.';
+            if (activeTemplateAttachmentCount > 0) {
+                confirmMessage += `\n\nThe ${activeTemplateAttachmentCount} attachment${activeTemplateAttachmentCount === 1 ? '' : 's'} from the previous template will be removed and replaced with any new template attachments.`;
+            }
+
+            const result = await Swal.fire({
+                title: 'Apply Template?',
+                text: confirmMessage,
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonText: 'Apply Template',
+                cancelButtonText: 'Cancel'
+            });
+
+            if (!result.isConfirmed) {
+                return;
+            }
+
+            // Always clear existing template-origin attachments before applying a new template.
+            // This prevents accumulation when tracking state gets out of sync.
+            if (currentEmailId) {
+                await deleteOriginAttachments(currentEmailId);
+                activeTemplateAttachmentCount = 0;
+                if (emailAttachmentsTable) {
+                    emailAttachmentsTable.ajax.reload();
+                }
+            }
+
+            // Apply the template
+            const subject = template.subject || template.Subject || '';
+            let body = template.body || template.bodyHTML || template.Body || template.BodyHTML || '';
+            const sendFrom = template.sendFrom || template.SendFrom || '';
+
+            // Process template variables using Handlebars if available
+            if (body && applicationDetails && mappingConfig) {
+                try {
+                    const templateData = extractTemplateData(applicationDetails, mappingConfig);
+                    const handlebarsTemplate = Handlebars.compile(body);
+                    body = handlebarsTemplate(templateData);
+                } catch (e) {
+                    console.warn('Failed to process template variables:', e);
+                }
+            }
+
+            // Apply template to current email being edited
+            UIElements.inputEmailSubject.val(subject);
+            if (body) {
+                editorInstance.setContent(body);
+            }
+            UIElements.inputEmailBody.val(body || '');
+            UIElements.inputEmailFrom.val(sendFrom || defaultValues.emailFrom);
+            const templateRecipients = await resolveTemplateRecipientEmailsFromApi(template, template.id || template.Id);
+            if (templateRecipients) {
+                UIElements.inputEmailTo.val(templateRecipients).trigger('change');
+            }
+            activeTemplateId = template.id || template.Id;
+            activeTemplateAttachmentCount = 0;
+
+            updateSelectedTemplateLabel(template.name || template.Name || 'Unnamed Template', template.id || template.Id);
+
+            // Programmatic field updates do not fire input events; re-evaluate dirty state.
+            handleDraftChange();
+
+            // Copy template attachments to the email log
+            const attachmentCount = await copyTemplateAttachments(template.id || template.Id, currentEmailId);
+            activeTemplateAttachmentCount = attachmentCount;
+
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+
+            await Swal.fire({
+                title: 'Template Applied',
+                text: attachmentCount > 0
+                    ? `${attachmentCount} attachment${attachmentCount === 1 ? '' : 's'} from the template ${attachmentCount === 1 ? 'has' : 'have'} been copied to this email.`
+                    : 'Template applied successfully. No attachments were copied.',
+                icon: 'success',
+                confirmButtonText: 'OK'
+            });
+        } catch (e) {
+            console.error('Failed to apply template:', e);
+            abp.notify.error('Failed to apply template. Please try again.');
+        }
+    }
 
     let isViewingDraft = false; // Track if we're viewing a draft email
 
     PubSub.subscribe('email_selected', (msg, data) => {
         console.log("EMAIL SELECTED EVENT FIRED", data);
 
+        // Set application context (editing existing emails, not templates)
+        isApplicationEmailContext = true;
+        document.body.classList.add('application-email-context');
+
         // Determine if this is a draft FIRST, before any field population
-        const isDraft = data?.status === 'Draft';
+        const status = (data?.status || '').toString().trim().toLowerCase();
+        const isDraft = status === 'draft';
         isViewingDraft = isDraft; // Set flag early to prevent handleDraftChange from enabling buttons
         console.log('isViewingDraft set to:', isViewingDraft);
 
@@ -1422,10 +2048,17 @@
             isNewEmailDraft = false;
             newDraftId = null;
         }
+
+        const selectedRecordTemplateName = resolveEmailRecordTemplateName(data);
+        activeTemplateId = data?.templateId || data?.emailTemplateId || data?.TemplateId || data?.EmailTemplateId || activeTemplateId;
+        originalTemplateState = {
+            name: selectedRecordTemplateName,
+            id: (activeTemplateId || '').toString()
+        };
+
         resetValidationErrors();
         console.log("data", data)
-        $('#EmailTemplateName').val(data.templateName);
-        $('#EmailTemplateName').prop('disabled', true);
+        $('#EmailTemplateName').val(selectedRecordTemplateName);
         UIElements.inputEmailId.val(data.id);
         UIElements.inputOriginalEmailTo.val(data.toAddress);
         UIElements.inputOriginalEmailCC.val(data.cc?.replaceAll(',', '; ') ?? '');
@@ -1439,7 +2072,7 @@
             license_key: 'gpl',
             selector: '#EmailBody',
             plugins: getPlugins(),
-            toolbar: getToolbarOptions(),
+            menubar: 'file edit view insert format tools',
             resize: true,
             statusbar: true,
             elementpath: false,
@@ -1454,7 +2087,96 @@
                     handleDraftChange();
                 });
                 editorInstance = editor;
-                editorInstance.setContent(refreshTodayDateSpans(data.body));
+            },
+            init_instance_callback: function (editor) {
+                // Set initial content
+                const bodyContent = data.body ? refreshTodayDateSpans(data.body) : '';
+                if (bodyContent) {
+                    const sanitizedBodyContent = sanitizeTinyMceHtml(bodyContent);
+                    editorInstance.setContent(sanitizedBodyContent);
+                }
+
+                // Create template label and buttons in label container
+                setTimeout(() => {
+                    const $menubar = $(editor.getContainer()).find('.tox-menubar');
+
+                    updateSelectedTemplateLabel(selectedRecordTemplateName, activeTemplateId || '');
+
+                    // Templates select - add to TinyMCE menu bar at bottom
+                    if (!$menubar.find('.templates-button-container').length) {
+                        // Create select element for templates
+                        const $templatesSelect = $('<select>')
+                            .addClass('templates-select templates-button-container')
+                            .attr('title', 'Select a template to apply');
+
+                        // Disable template selection for non-draft emails.
+                        $templatesSelect.prop('disabled', !isDraft);
+
+                        // Keep "Templates" as the control label, but not as a selectable option.
+                        $('<option>')
+                            .val('')
+                            .text(selectedRecordTemplateName || 'Templates')
+                            .prop('selected', true)
+                            .prop('disabled', true)
+                            .prop('hidden', !selectedRecordTemplateName)
+                            .appendTo($templatesSelect);
+
+                        // Load templates and populate select
+                        $templatesSelect.on('change', async function () {
+                            if (!isDraft) {
+                                return;
+                            }
+
+                            const selectedTemplateId = $(this).val();
+
+                            if (!selectedTemplateId) {
+                                return;
+                            }
+
+                            // Reset select to default
+                            $(this).val('');
+
+                            try {
+                                const response = await $.ajax({
+                                    url: `/api/form-notifications/templates`,
+                                    type: 'GET'
+                                });
+
+                                const template = response.find(t => t.id === selectedTemplateId || t.Id === selectedTemplateId);
+
+                                if (template) {
+                                    // Route all template changes through one apply flow so confirmation UX is consistent.
+                                    await applyTemplateToEmail(template);
+                                } else {
+                                    abp.notify.error('Template not found.');
+                                }
+                            } catch (e) {
+                                console.error('Failed to apply template:', e);
+                                abp.notify.error('Failed to apply template.');
+                            }
+                        });
+
+                        // Load templates on first click
+                        $templatesSelect.on('click', async function (e) {
+                            if (!isDraft || $(this).prop('disabled')) {
+                                e.preventDefault();
+                                return;
+                            }
+
+                            try {
+                                await ensureTemplatesSelectOptionsLoaded($(this));
+                            } catch (err) {
+                                console.error('Failed to load templates:', err);
+                                abp.notify.error('Failed to load templates.');
+                            }
+                        });
+
+                        $menubar.append($templatesSelect);
+                    }
+
+                    // Ensure disabled option text matches selected record after select exists.
+                    updateSelectedTemplateLabel(selectedRecordTemplateName, activeTemplateId || '');
+                }, 100);
             }
         });
         UIElements.inputEmailTo.val(data.toAddress);
@@ -1462,7 +2184,9 @@
         UIElements.inputEmailBCC.val(data.bcc?.replaceAll(',', '; ') ?? '');
         UIElements.inputEmailFrom.val(data.fromAddress);
         UIElements.inputEmailSubject.val(data.subject);
-        UIElements.inputEmailBody.val(refreshTodayDateSpans(data.body));
+        const bodyContentWithRefresh = refreshTodayDateSpans(data.body);
+        UIElements.inputEmailBody.val(bodyContentWithRefresh);
+        UIElements.inputOriginalEmailBody.val(bodyContentWithRefresh);
 
         // Load scheduled send date/time if available
         if (data.sendOnDateTime) {
@@ -1788,6 +2512,89 @@ function getPlugins() {
     return 'lists link image preview code';
 }
 
+/**
+ * Returns a valid template name, or empty when placeholder/sentinel values are selected.
+ * @param {string} value - Candidate template name
+ * @returns {string} Normalized template name
+ */
+function normalizeTemplateName(value) {
+    const name = (value || '').trim();
+    if (!name) {
+        return '';
+    }
+
+    const lowerName = name.toLowerCase();
+    if (
+        lowerName === 'please select' ||
+        lowerName === 'select a template' ||
+        lowerName === 'templates' ||
+        lowerName === 'no template selected' ||
+        lowerName.includes('select')
+    ) {
+        return '';
+    }
+
+    return name;
+}
+
+function resolveEmailRecordTemplateName(emailRecord) {
+    const rawName = [
+        emailRecord?.templateName,
+        emailRecord?.emailTemplateName,
+        emailRecord?.template,
+        emailRecord?.templateTitle,
+        emailRecord?.TemplateName,
+        emailRecord?.EmailTemplateName,
+        emailRecord?.Template,
+        emailRecord?.TemplateTitle
+    ].find(value => normalizeTemplateName(value));
+
+    return normalizeTemplateName(rawName || '');
+}
+
+/**
+ * TinyMCE can throw when loading persisted blob: URIs without a matching blob cache entry.
+ * Strip blob URLs from HTML before setContent to avoid editor initialization crashes.
+ * @param {string} html - Raw HTML
+ * @returns {string} Sanitized HTML safe for TinyMCE setContent
+ */
+function sanitizeTinyMceHtml(html) {
+    if (!html || typeof html !== 'string') {
+        return html || '';
+    }
+
+    try {
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(`<div id="tinymce-sanitize-root">${html}</div>`, 'text/html');
+        const root = doc.getElementById('tinymce-sanitize-root');
+        if (!root) {
+            return html;
+        }
+
+        root.querySelectorAll('[src], [href], [style]').forEach((element) => {
+            const src = element.getAttribute('src');
+            if (src?.trim().toLowerCase().startsWith('blob:')) {
+                element.removeAttribute('src');
+            }
+
+            const href = element.getAttribute('href');
+            if (href?.trim().toLowerCase().startsWith('blob:')) {
+                element.removeAttribute('href');
+            }
+
+            const style = element.getAttribute('style');
+            if (style?.toLowerCase().includes('blob:')) {
+                element.setAttribute('style', style.replaceAll(/url\([^)]*blob:[^)]*\)/gi, 'url("")'));
+            }
+        });
+
+        return root.innerHTML;
+    } catch (e) {
+        console.warn('Failed to sanitize TinyMCE HTML content:', e);
+        return html;
+    }
+}
+
 
 /**
  * Displays validation error toast using abp.notify or toastr
@@ -1909,7 +2716,7 @@ function checkOnlyErrorIsTinyMCE(isValid, errorList, fieldName, tinymceContent)
 
 
 function validateEmailFieldWithOptions(fieldElement, isRequired = false, showToast = false, onlyShowErrorsIfHasContent = false) {
-    const result = validateEmailField(fieldElement, isRequired, showToast, onlyShowErrorsIfHasContent);
+    const result = globalThis.validateEmailField(fieldElement, isRequired, showToast, onlyShowErrorsIfHasContent);
     return result;
 }
 
@@ -1982,6 +2789,16 @@ function normalizeErrorMessage(message) {
 }
 
 
+function buildVariablesMenuItems(config, editor) {
+    return (config || []).map(item => ({
+        type: 'menuitem',
+        text: item.name,
+        onAction: () => {
+            editor.insertContent(`{{${item.token}}}`);
+        }
+    }));
+}
+
 /**
  * Validates date values
  * @param {number} month - Month (1-12)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml
index 23e541c73d..3b42f4dabb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="/libs/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css" />
 <link rel="stylesheet" href="/Views/Shared/Components/Notifications/Default.css" />
 
-<!-- Select2 and component scripts loaded in Default.js after jQuery is available -->
+<script src="/js/formConfiguration/NotificationsPreview.js"></script>
 <script src="/Views/Shared/Components/Notifications/Default.js"></script>
 
 <div class="notifications-widget p-3">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
index 6f5536e946..7aa69023e8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
@@ -15,10 +15,6 @@
 
         const script = document.createElement('script');
         script.src = '/libs/select2/dist/js/select2.min.js';
-        script.onload = function() {
-            console.debug('Select2 library loaded successfully');
-            // Initialization will happen in waitForSelect2()
-        };
         script.onerror = function() {
             console.error('Failed to load Select2 library');
             select2Loading = false;
@@ -51,7 +47,6 @@
                         closeOnSelect: true,
                         allowClear: false
                     });
-                    console.log('Select2 initialized successfully');
                 } catch (e) {
                     console.error('Failed to initialize Select2:', e);
                     select2Ready = false;
@@ -426,6 +421,82 @@
         refreshSelect2();
     }
 
+    function decodeHtmlEntities(value) {
+        if (!value || typeof value !== 'string') {
+            return '';
+        }
+
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(value, 'text/html');
+        return doc.documentElement.textContent || '';
+    }
+
+    function decodeHtmlEntitiesRecursively(value, maxPasses = 12) {
+        let current = value || '';
+        for (let i = 0; i < maxPasses; i++) {
+            const decoded = decodeHtmlEntities(current);
+            if (!decoded || decoded === current) {
+                break;
+            }
+            current = decoded;
+
+            if (/<[a-z][\s\S]*>/i.test(current)) {
+                break;
+            }
+        }
+        return current;
+    }
+
+    function resolveTemplatePreviewBody(template) {
+        const rawBody =
+            template?.body ||
+            template?.bodyHtml ||
+            template?.bodyHTML ||
+            template?.Body ||
+            template?.BodyHtml ||
+            template?.BodyHTML ||
+            '';
+
+        const decodedBody = decodeHtmlEntitiesRecursively(rawBody);
+
+        // Prefer decoded content when it results in actual HTML tags.
+        if (/<[a-z][\s\S]*>/i.test(decodedBody)) {
+            return decodedBody;
+        }
+
+        // Fall back to raw body when it already contains HTML tags.
+        if (/<[a-z][\s\S]*>/i.test(rawBody)) {
+            return rawBody;
+        }
+
+        // Plain text body (no tags) still displays correctly.
+        return decodedBody || rawBody;
+    }
+
+    function renderTemplatePreview(previewElement, template) {
+        if (!previewElement) {
+            return;
+        }
+
+        previewElement.replaceChildren();
+
+        if (!template) {
+            return;
+        }
+
+        const subjectRow = document.createElement('div');
+        const subjectLabel = document.createElement('strong');
+        subjectLabel.textContent = 'Subject: ';
+        const subjectValue = document.createElement('span');
+        subjectValue.textContent = template.subject || template.Subject || '';
+        subjectRow.append(subjectLabel, subjectValue);
+
+        const bodyRow = document.createElement('div');
+        bodyRow.innerHTML = resolveTemplatePreviewBody(template);
+
+        previewElement.append(subjectRow, document.createElement('br'), bodyRow);
+    }
+
     function updatePreview() {
         const sel = document.getElementById('templateSelect');
         const preview = document.getElementById('templatePreview');
@@ -433,7 +504,7 @@
         const val = sel.value;
         fetch('/api/form-notifications/templates').then(r => r.json()).then(list => {
             const t = list.find(x => String(x.id) === String(val));
-            preview.innerText = t ? `${t.subject}\n\n${t.body}` : '';
+            renderTemplatePreview(preview, t);
         });
     }
 
@@ -451,7 +522,7 @@
         document.getElementById('dateOptions')?.classList.add('hidden-section');
         document.getElementById('eventOptions')?.classList.add('hidden-section');
         document.getElementById('recipientOptions')?.classList.add('hidden-section');
-        document.getElementById('templatePreview').innerText = '';
+        renderTemplatePreview(document.getElementById('templatePreview'), null);
 
         const modalEl = document.getElementById('notificationModal');
         if (modalEl === null) return;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js
index 2ec7e6dc38..1e647c841a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js
@@ -47,7 +47,7 @@
         if (!sel || !preview) return;
         fetch('/api/form-notifications/templates').then(r => r.json()).then(list => {
             const t = list.find(x => String(x.id) === sel.value);
-            preview.innerText = t ? `Subject: ${t.subject}\n\n${t.body}` : '';
+            globalThis.renderNotificationTemplatePreview(preview, t);
         });
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js
index 9000749c2c..811d084201 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js
@@ -47,7 +47,7 @@
         if (!sel || !preview) return;
         fetch('/api/form-notifications/templates').then(r => r.json()).then(list => {
             const t = list.find(x => String(x.id) === sel.value);
-            preview.innerText = t ? `Subject: ${t.subject}\n\n${t.body}` : '';
+            globalThis.renderNotificationTemplatePreview(preview, t);
         });
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js
new file mode 100644
index 0000000000..6e12dea3ab
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js
@@ -0,0 +1,89 @@
+(function () {
+    function decodeHtmlEntities(value) {
+        if (!value || typeof value !== 'string') {
+            return '';
+        }
+
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(value, 'text/html');
+        return doc.documentElement.textContent || '';
+    }
+
+    function decodeHtmlEntitiesRecursively(value, maxPasses = 3) {
+        let current = value || '';
+
+        for (let pass = 0; pass < maxPasses; pass++) {
+            const decoded = decodeHtmlEntities(current);
+            if (!decoded || decoded === current) {
+                break;
+            }
+            current = decoded;
+
+            if (/<[a-z][\s\S]*>/i.test(current)) {
+                break;
+            }
+        }
+
+        return current;
+    }
+
+    function resolveTemplateBodyHtml(template) {
+        const rawBody =
+            template.body ||
+            template.bodyHtml ||
+            template.bodyHTML ||
+            template.Body ||
+            template.BodyHtml ||
+            template.BodyHTML ||
+            '';
+
+        if (/<[a-z][\s\S]*>/i.test(rawBody)) {
+            return rawBody;
+        }
+
+        if (
+            rawBody.includes('&lt;') ||
+            rawBody.includes('&#60;') ||
+            rawBody.includes('&amp;lt;') ||
+            rawBody.includes('&amp;#60;')
+        ) {
+            return decodeHtmlEntitiesRecursively(rawBody);
+        }
+
+        return rawBody;
+    }
+
+    function resolveTemplateSubject(template) {
+        return (
+            template.subject ||
+            template.Subject ||
+            ''
+        );
+    }
+
+    function renderNotificationTemplatePreview(previewElement, template) {
+        if (!previewElement) {
+            return;
+        }
+
+        previewElement.replaceChildren();
+
+        if (!template) {
+            return;
+        }
+
+        const subjectRow = document.createElement('div');
+        const subjectLabel = document.createElement('strong');
+        subjectLabel.textContent = 'Subject: ';
+        const subjectValue = document.createElement('span');
+        subjectValue.textContent = resolveTemplateSubject(template);
+        subjectRow.append(subjectLabel, subjectValue);
+
+        const bodyRow = document.createElement('div');
+        bodyRow.innerHTML = resolveTemplateBodyHtml(template);
+
+        previewElement.append(subjectRow, document.createElement('br'), bodyRow);
+    }
+
+    globalThis.renderNotificationTemplatePreview = renderNotificationTemplatePreview;
+})();
\ No newline at end of file

From dc3d120d286a8b08c323e39689ef57c3e69111f5 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 8 Jul 2026 12:39:58 -0700
Subject: [PATCH 6/9] AB#33757: Add Signed-Off Column in Reports History

---
 .../History/CreateUpdateReportsHistoryDto.cs  |    1 +
 .../History/ReportsHistoryDto.cs              |    1 +
 .../Applications/ReportsHistory.cs            |    1 +
 ...703_AddReportsHistorySignedOff.Designer.cs | 5255 +++++++++++++++++
 ...260708192703_AddReportsHistorySignedOff.cs |   28 +
 .../GrantTenantDbContextModelSnapshot.cs      |    3 +
 .../CreateReportsHistoryModal.cshtml          |   11 +
 .../CreateReportsHistoryModal.cshtml.cs       |    1 +
 .../EditReportsHistoryModal.cshtml            |   11 +
 .../EditReportsHistoryModal.cshtml.cs         |    2 +
 .../ReportsHistoryModalViewModel.cs           |    3 +
 .../Components/ApplicantHistory/Default.js    |    3 +-
 12 files changed, 5319 insertions(+), 1 deletion(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs
index e3d66bfb30..a90cc1de51 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs
@@ -8,6 +8,7 @@ public class CreateUpdateReportsHistoryDto
     public string? FiscalYear { get; set; }
     public DateTime? ReportDate { get; set; }
     public bool? Outstanding { get; set; }
+    public bool? SignedOff { get; set; }
     public bool? IncompleteReport { get; set; }
     public string? Note { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs
index a9161dc025..836088495f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs
@@ -9,6 +9,7 @@ public class ReportsHistoryDto : AuditedEntityDto<Guid>
     public string? FiscalYear { get; set; }
     public DateTime? ReportDate { get; set; }
     public bool? Outstanding { get; set; }
+    public bool? SignedOff { get; set; }
     public bool? IncompleteReport { get; set; }
     public string? Note { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs
index cd6f4e683a..acaeca82eb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs
@@ -10,6 +10,7 @@ public class ReportsHistory : AuditedAggregateRoot<Guid>, IMultiTenant
     public string? FiscalYear { get; set; }
     public DateTime? ReportDate { get; set; }
     public bool? Outstanding { get; set; }
+    public bool? SignedOff { get; set; }
     public bool? IncompleteReport { get; set; }
     public string? Note { get; set; }
     public Guid? TenantId { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs
new file mode 100644
index 0000000000..35db150b2b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs
@@ -0,0 +1,5255 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260708192703_AddReportsHistorySignedOff")]
+    partial class AddReportsHistorySignedOff
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("ExternalStatusVisibility")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool?>("SignedOff")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("CancelledBy")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("CancelledBy");
+
+                    b.Property<Guid?>("CancelledById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CancelledById");
+
+                    b.Property<DateTime?>("CancelledOn")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CancelledOn");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs
new file mode 100644
index 0000000000..e0f62fc3c8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddReportsHistorySignedOff : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "SignedOff",
+                table: "ReportsHistories",
+                type: "boolean",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SignedOff",
+                table: "ReportsHistories");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
index dd62139e2d..cc3b99eb73 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
@@ -2465,6 +2465,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("ReportDate")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<bool?>("SignedOff")
+                        .HasColumnType("boolean");
+
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uuid")
                         .HasColumnName("TenantId");
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml
index c2edb12200..a3056c8958 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml
@@ -37,6 +37,17 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <div class="switch-container">
+                    <div class="form-check unt-form-switch form-switch">
+                        <input class="form-check-input" type="checkbox" id="ReportsHistoryForm_SignedOff"
+                               name="ReportsHistoryForm.SignedOff" value="true"
+                               @(Model.ReportsHistoryForm?.SignedOff == true ? "checked" : "") />
+                        <label class="form-check-label" for="ReportsHistoryForm_SignedOff">Signed-Off</label>
+                    </div>
+                </div>
+            </div>
+
             <div class="mb-3">
                 <div class="switch-container">
                     <div class="form-check unt-form-switch form-switch">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs
index bd6e691cb5..52c01e1be1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs
@@ -34,6 +34,7 @@ public async Task<IActionResult> OnPostAsync()
             FiscalYear = ReportsHistoryForm.FiscalYear,
             ReportDate = ReportsHistoryForm.ReportDate,
             Outstanding = ReportsHistoryForm.Outstanding,
+            SignedOff = ReportsHistoryForm.SignedOff,
             IncompleteReport = ReportsHistoryForm.IncompleteReport,
             Note = ReportsHistoryForm.Note
         };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml
index 904aa84d71..63a69c597b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml
@@ -38,6 +38,17 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <div class="switch-container">
+                    <div class="form-check unt-form-switch form-switch">
+                        <input class="form-check-input" type="checkbox" id="ReportsHistoryForm_SignedOff"
+                               name="ReportsHistoryForm.SignedOff" value="true"
+                               @(Model.ReportsHistoryForm?.SignedOff == true ? "checked" : "") />
+                        <label class="form-check-label" for="ReportsHistoryForm_SignedOff">Signed-Off</label>
+                    </div>
+                </div>
+            </div>
+
             <div class="mb-3">
                 <div class="switch-container">
                     <div class="form-check unt-form-switch form-switch">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs
index de58139700..f7eeaf2932 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs
@@ -31,6 +31,7 @@ public async Task OnGetAsync(Guid id)
             FiscalYear = record.FiscalYear,
             ReportDate = record.ReportDate,
             Outstanding = record.Outstanding,
+            SignedOff = record.SignedOff,
             IncompleteReport = record.IncompleteReport,
             Note = record.Note
         };
@@ -44,6 +45,7 @@ public async Task<IActionResult> OnPostAsync()
             FiscalYear = ReportsHistoryForm.FiscalYear,
             ReportDate = ReportsHistoryForm.ReportDate,
             Outstanding = ReportsHistoryForm.Outstanding,
+            SignedOff = ReportsHistoryForm.SignedOff,
             IncompleteReport = ReportsHistoryForm.IncompleteReport,
             Note = ReportsHistoryForm.Note
         };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs
index c7cf9b8522..5c23d0e27d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs
@@ -20,6 +20,9 @@ public class ReportsHistoryModalViewModel
     [DisplayName("Outstanding")]
     public bool? Outstanding { get; set; }
 
+    [DisplayName("Signed-Off")]
+    public bool? SignedOff { get; set; }
+
     [DisplayName("Incomplete Report")]
     public bool? IncompleteReport { get; set; }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
index 65bf1e705a..df2b45663e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
@@ -187,6 +187,7 @@ $(function () {
                 }
             },
             { title: 'Outstanding', data: 'outstanding', name: 'outstanding', className: 'data-table-header', width: '100px', render: (d) => d === true ? 'Yes' : 'No' },
+            { title: 'Signed-Off', data: 'signedOff', name: 'signedOff', className: 'data-table-header', width: '100px', render: (d) => d === true ? 'Yes' : 'No' },
             { title: 'Incomplete Report', data: 'incompleteReport', name: 'incompleteReport', className: 'data-table-header', width: '130px', render: (d) => d === true ? 'Yes' : 'No' },
             {
                 title: 'Note', data: 'note', name: 'note', className: 'data-table-header', width: '200px',
@@ -326,7 +327,7 @@ $(function () {
 
     const reportsHistoryTable = initializeDataTable({
         dt: $('#ReportsHistoryTable'),
-        defaultVisibleColumns: ['fiscalYear', 'reportDate', 'outstanding', 'incompleteReport', 'note', 'actions'],
+        defaultVisibleColumns: ['fiscalYear', 'reportDate', 'outstanding', 'signedOff', 'incompleteReport', 'note', 'actions'],
         listColumns: getReportsHistoryColumns(),
         dataEndpoint: () => unity.grantManager.applicantProfile.applicantHistory.getReportsHistoryList(getApplicantId()),
         data: () => ({}),

From bc59be138338d0c62d967ddb8517ed8a9f9d7a57 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 8 Jul 2026 13:07:31 -0700
Subject: [PATCH 7/9] AB#33757: Bugfix - modal popup appears on enter on any
 search textbox

---
 .../Components/ApplicantHistory/Default.js       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
index df2b45663e..b4c3ff5674 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
@@ -76,12 +76,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 funding-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 funding-delete-btn')
-                        .attr({ 'title': 'Delete Funding History', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Funding History', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -110,12 +110,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 issue-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 issue-delete-btn')
-                        .attr({ 'title': 'Delete Issue Tracking', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Issue Tracking', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -156,12 +156,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 audit-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 audit-delete-btn')
-                        .attr({ 'title': 'Delete Audit History', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Audit History', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -201,12 +201,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 reports-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 reports-delete-btn')
-                        .attr({ 'title': 'Delete Reports History', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Reports History', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 

From a707d9654c2a6b7d46f3ce398bc315393bb9345d Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Wed, 8 Jul 2026 14:03:36 -0700
Subject: [PATCH 8/9] feature/AB#32580-TemplateAttachments

---
 .../NotificationsSettingGroup/Default.js      | 126 ++++---
 .../Components/EmailsWidget/Default.css       |   2 +-
 .../Shared/Components/EmailsWidget/Default.js | 336 ++++++++++--------
 3 files changed, 264 insertions(+), 200 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
index 1e24a6d331..d0de520f59 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
@@ -126,7 +126,14 @@ $(function () {
     }
 
     function setSelectedTemplateRecipients(values) {
-        let valueArr = Array.isArray(values) ? values : (values ? [values] : []);
+        let valueArr;
+        if (Array.isArray(values)) {
+            valueArr = values;
+        } else if (values) {
+            valueArr = [values];
+        } else {
+            valueArr = [];
+        }
         $('#templateRecipientSelect').val(valueArr).trigger('change');
     }
 
@@ -438,6 +445,36 @@ $(function () {
             });
     }
 
+    function handleDeleteCanCheckSuccess(response, templateId) {
+        if (response.canDelete) {
+            proceedWithDelete(templateId, function () {
+                PubSub.publish('reload_templates_table_with_close');
+            });
+        } else {
+            abp.notify.error(response.errorMessage || 'This template cannot be deleted because it is currently in use.');
+        }
+    }
+
+    function handleDeleteCanCheckError(templateId) {
+        // If check fails, proceed with deletion
+        proceedWithDelete(templateId, function () {
+            PubSub.publish('reload_templates_table_with_close');
+        });
+    }
+
+    function checkCanDeleteTemplate(templateId) {
+        $.ajax({
+            url: `/api/form-notifications/can-delete-template/${templateId}`,
+            type: 'GET',
+            success: function (response) {
+                handleDeleteCanCheckSuccess(response, templateId);
+            },
+            error: function () {
+                handleDeleteCanCheckError(templateId);
+            }
+        });
+    }
+
     UiElements.deleteButton.on('click', function () {
         let templateId = $('#templateId').val();
         abp.message.confirm(
@@ -445,25 +482,7 @@ $(function () {
             'Delete Template',
             function (confirmed) {
                 if (confirmed) {
-                    $.ajax({
-                        url: `/api/form-notifications/can-delete-template/${templateId}`,
-                        type: 'GET',
-                        success: function (response) {
-                            if (response.canDelete) {
-                                proceedWithDelete(templateId, function () {
-                                    PubSub.publish('reload_templates_table_with_close');
-                                });
-                            } else {
-                                abp.notify.error(response.errorMessage || 'This template cannot be deleted because it is currently in use.');
-                            }
-                        },
-                        error: function () {
-                            // If check fails, proceed with deletion
-                            proceedWithDelete(templateId, function () {
-                                PubSub.publish('reload_templates_table_with_close');
-                            });
-                        }
-                    });
+                    checkCanDeleteTemplate(templateId);
                 }
             }
         );
@@ -553,6 +572,33 @@ $(function () {
             fixedHeaders: true
         });
 
+        // ── Helper: Select and initialize template by ID ──
+        function selectTemplateById(templateId) {
+            const rows = templatesDataTable.rows().data();
+            for (let i = 0; i < rows.length; i++) {
+                if (rows[i].id === templateId) {
+                    const $row = $(templatesDataTable.row(i).node());
+                    const rowData = templatesDataTable.row(i).data();
+                    if (rowData) {
+                        initializeTemplateVariables();
+                        initializeEditor(rowData, dropdownItems);
+                        populateFields(rowData);
+                        
+                        // Highlight selected row
+                        $('#TemplatesTable tbody tr').removeClass('template-selected');
+                        $row.addClass('template-selected');
+                        openRightPanel();
+                        
+                        // Publish event for pub/sub listeners
+                        PubSub.publish('template_selected_from_email_editor', {
+                            templateId: templateId
+                        });
+                    }
+                    break;
+                }
+            }
+        }
+
         // ── Auto-select template from localStorage if navigating from email editor ──
         let hasCheckedAutoSelect = false;
         $('#TemplatesTable').on('draw.dt', function () {
@@ -573,31 +619,7 @@ $(function () {
             
             // Wait for tab transition to complete, then find and select the template
             setTimeout(() => {
-                const rows = templatesDataTable.rows().data();
-                for (let i = 0; i < rows.length; i++) {
-                    if (rows[i].id === templateToSelectId) {
-                        const $row = $(templatesDataTable.row(i).node());
-                        
-                        // Trigger the same selection logic
-                        const rowData = templatesDataTable.row(i).data();
-                        if (rowData) {
-                            initializeTemplateVariables();
-                            initializeEditor(rowData, dropdownItems);
-                            populateFields(rowData);
-                            
-                            // Highlight selected row
-                            $('#TemplatesTable tbody tr').removeClass('template-selected');
-                            $row.addClass('template-selected');
-                            openRightPanel();
-                            
-                            // Publish event for pub/sub listeners
-                            PubSub.publish('template_selected_from_email_editor', {
-                                templateId: templateToSelectId
-                            });
-                        }
-                        break;
-                    }
-                }
+                selectTemplateById(templateToSelectId);
             }, 150);
         });
 
@@ -623,7 +645,6 @@ $(function () {
         // ── Edit button click ──────────────────────────────────────────────────
         $('#TemplatesTable').on('click', '.template-edit-btn', function (e) {
             e.stopPropagation();
-            const templateId = $(this).data('id');
             const rowData = templatesDataTable.row($(this).closest('tr')).data();
             
             if (!rowData) return;
@@ -1081,8 +1102,13 @@ function deleteEmailAttachment(attachmentId) {
     );
 }
 
-function isValidEmail(email) {
-    // Basic email validation regex
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(email);
+/**
+  * Validates email format
+  * @param {string} email - Email address to validate
+  * @returns {boolean} True if valid email format
+  */
+function validateEmail(email) {
+    // Optimized regex to prevent ReDoS: use atomic-like patterns with specific character classes
+    const emailRegex = /^[a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+    return emailRegex.exec(String(email).toLowerCase()) !== null;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
index 11e4eaea94..d4aae78553 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
@@ -1038,7 +1038,7 @@ input#EmailFrom.input-validation-error {
     z-index: 10 !important;
 }
 
-.tox *:not(svg):not(rect)& {
+.tox *:not(svg):not(rect) {
     background-color: initial;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     font-size: 14px !important;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 28c72f3b36..5ad5c9aa44 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -1113,6 +1113,78 @@
         }
     }
 
+    async function processTemplateBody(body) {
+        if (body && applicationDetails && mappingConfig) {
+            try {
+                const templateData = extractTemplateData(applicationDetails, mappingConfig);
+                const template = Handlebars.compile(body);
+                const processedBody = template(templateData);
+                console.log('Template variables replaced, rendered body length:', processedBody?.length);
+                return processedBody;
+            } catch (e) {
+                console.warn('Failed to process template variables:', e);
+            }
+        } else {
+            console.log('Handlebars processing skipped - applicationDetails or mappingConfig not available');
+        }
+        return body;
+    }
+
+    async function confirmTemplateReplacement() {
+        if (!newDraftId) {
+            return true;
+        }
+
+        let confirmMessage = 'Any changes to the email will be reverted to the template defaults.';
+        if (activeTemplateAttachmentCount > 0) {
+            confirmMessage += `\n\nThe ${activeTemplateAttachmentCount} attachment${activeTemplateAttachmentCount === 1 ? '' : 's'} copied from the previous template will also be removed.`;
+        }
+
+        const confirm = await Swal.fire({
+            title: 'Apply Template?',
+            text: confirmMessage,
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: 'Apply Template',
+            cancelButtonText: 'Cancel'
+        });
+
+        if (!confirm.isConfirmed) {
+            return false;
+        }
+
+        if (activeTemplateAttachmentCount > 0) {
+            await deleteOriginAttachments(newDraftId);
+            activeTemplateAttachmentCount = 0;
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+        }
+
+        return true;
+    }
+
+    async function applyTemplateParamsToEmail(subject, body, sendFrom, templateName, selectedTemplateId, templateRecipients) {
+        const draftId = await handleNewEmail(true, subject, body, sendFrom, templateName, selectedTemplateId);
+        activeTemplateId = selectedTemplateId;
+        activeTemplateAttachmentCount = 0;
+        updateSelectedTemplateLabel(templateName, selectedTemplateId);
+
+        if (templateRecipients) {
+            UIElements.inputEmailTo.val(templateRecipients).trigger('change');
+            UIElements.inputOriginalEmailTo.val(templateRecipients);
+        }
+
+        const attachmentCount = await copyTemplateAttachments(selectedTemplateId, draftId);
+        activeTemplateAttachmentCount = attachmentCount;
+
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.ajax.reload();
+        }
+
+        return attachmentCount;
+    }
+
     async function handleTemplateSelection() {
         const selectedTemplateId = UIElements.templateSelectionDropdown.val();
 
@@ -1123,7 +1195,6 @@
         closeTemplateSelectionModal();
 
         try {
-            // Load all templates and find the selected one
             const response = await $.ajax({
                 url: `/api/form-notifications/templates`,
                 type: 'GET'
@@ -1132,16 +1203,7 @@
             console.log('API Response:', response);
             console.log('Selected Template ID:', selectedTemplateId);
 
-            // Try to find template with either camelCase or PascalCase property names
-            let selectedTemplate = response.find(t => t.id === selectedTemplateId);
-            let useUpperCase = false;
-
-            if (!selectedTemplate) {
-                console.warn('Template not found with camelCase, checking with PascalCase...');
-                console.log('Available template IDs:', response.map(t => t.id || t.Id));
-                selectedTemplate = response.find(t => t.Id === selectedTemplateId);
-                useUpperCase = true;
-            }
+            const { selectedTemplate, useUpperCase } = findTemplateById(response, selectedTemplateId);
 
             if (!selectedTemplate) {
                 abp.notify.error('Selected template not found.');
@@ -1150,80 +1212,23 @@
 
             console.log('Selected template:', selectedTemplate);
 
-            // Get property values with fallback for case differences
-            const subject = useUpperCase ? selectedTemplate.Subject : selectedTemplate.subject;
-            let body = useUpperCase ? (selectedTemplate.Body || selectedTemplate.BodyHTML) : (selectedTemplate.body || selectedTemplate.bodyHTML);
-            const sendFrom = useUpperCase ? selectedTemplate.SendFrom : selectedTemplate.sendFrom;
-
-            console.log('Template values - Subject:', subject, 'Body length:', body?.length, 'SendFrom:', sendFrom);
-
-            // Process template variables using Handlebars if applicationDetails is available
-            if (body && applicationDetails && mappingConfig) {
-                try {
-                    const templateData = extractTemplateData(applicationDetails, mappingConfig);
-                    const template = Handlebars.compile(body);
-                    body = template(templateData);
-                    console.log('Template variables replaced, rendered body length:', body?.length);
-                } catch (e) {
-                    console.warn('Failed to process template variables:', e);
-                    // Continue with unprocessed body if Handlebars fails
-                }
-            } else {
-                console.log('Handlebars processing skipped - applicationDetails or mappingConfig not available');
-            }
+            const { subject, body: initialBody, sendFrom, name: templateName } = extractTemplateValues(selectedTemplate, useUpperCase);
+            console.log('Template values - Subject:', subject, 'Body length:', initialBody?.length, 'SendFrom:', sendFrom);
 
-            const templateName = useUpperCase ? selectedTemplate.Name : selectedTemplate.name;
+            const body = await processTemplateBody(initialBody);
             const templateRecipients = await resolveTemplateRecipientEmailsFromApi(selectedTemplate, selectedTemplateId);
 
-            // If an email draft is already open, show confirmation before re-applying a template
-            if (newDraftId) {
-                let confirmMessage = 'Any changes to the email will be reverted to the template defaults.';
-                if (activeTemplateAttachmentCount > 0) {
-                    confirmMessage += `\n\nThe ${activeTemplateAttachmentCount} attachment${activeTemplateAttachmentCount === 1 ? '' : 's'} copied from the previous template will also be removed.`;
-                }
-                const confirm = await Swal.fire({
-                    title: 'Apply Template?',
-                    text: confirmMessage,
-                    icon: 'warning',
-                    showCancelButton: true,
-                    confirmButtonText: 'Apply Template',
-                    cancelButtonText: 'Cancel'
-                });
-                if (!confirm.isConfirmed) {
-                    return;
-                }
-                // Remove previous template attachments if any
-                if (activeTemplateAttachmentCount > 0) {
-                    await deleteOriginAttachments(newDraftId);
-                    activeTemplateAttachmentCount = 0;
-                    if (emailAttachmentsTable) {
-                        emailAttachmentsTable.ajax.reload();
-                    }
-                }
-            }
-
-            // Initialize email with template data
-            const draftId = await handleNewEmail(true, subject, body, sendFrom, templateName, selectedTemplateId);
-            activeTemplateId = selectedTemplateId;
-            activeTemplateAttachmentCount = 0;
-            updateSelectedTemplateLabel(templateName, selectedTemplateId);
-            if (templateRecipients) {
-                UIElements.inputEmailTo.val(templateRecipients).trigger('change');
-                UIElements.inputOriginalEmailTo.val(templateRecipients);
+            const shouldContinue = await confirmTemplateReplacement();
+            if (!shouldContinue) {
+                return;
             }
 
-            // Copy template attachments to the email log
-            const attachmentCount = await copyTemplateAttachments(selectedTemplateId, draftId);
-            activeTemplateAttachmentCount = attachmentCount;
-
-            if (emailAttachmentsTable) {
-                emailAttachmentsTable.ajax.reload();
-            }
+            const attachmentCount = await applyTemplateParamsToEmail(subject, body, sendFrom, templateName, selectedTemplateId, templateRecipients);
 
             await Swal.fire({
                 title: 'Template Applied',
                 text: attachmentCount > 0
-                    ? `${attachmentCount} attachment${attachmentCount === 1 ? '' : 's'} from the template ${attachmentCount === 1 ? 'has' : 'have'} been copied to this email.`
+                    ? buildSuccessMessage(attachmentCount)
                     : 'Template applied successfully. No attachments were copied.',
                 icon: 'success',
                 confirmButtonText: 'OK'
@@ -1294,9 +1299,7 @@
             return;
         }
 
-        tinymce.get("EmailBody")?.remove();
-
-        console.log('Initializing TinyMCE with template body:', templateBody?.substring(0, 50) + '...');
+        tinymce.get("EmailBody")?.remove();   
 
         // Show modal FIRST so element is in DOM
         UIElements.inputEmailSubject.val(templateSubject);
@@ -1330,16 +1333,12 @@
                 editorInstance = editor;
             },
             init_instance_callback: function (editor) {
-                console.log('TinyMCE init_instance_callback - editor ready, setting content');
-                console.log('Template body:', templateBody);
                 try {
                     if (templateBody) {
                         const sanitizedTemplateBody = sanitizeTinyMceHtml(templateBody);
                         editor.setContent(sanitizedTemplateBody, { format: 'html' });
-                        console.log('Content set successfully. Editor content now:', editor.getContent().substring(0, 50));
                         UIElements.inputEmailBody.val(sanitizedTemplateBody);
                     } else {
-                        console.warn('Template body is empty');
                         editor.setContent('');
                     }
                 } catch (e) {
@@ -1932,92 +1931,82 @@
         return templateData;
     }
 
+    function buildConfirmationMessage() {
+        let message = 'Selecting a template will revert any changes made to this email.';
+        if (activeTemplateAttachmentCount > 0) {
+            const count = activeTemplateAttachmentCount;
+            const plural = count === 1 ? '' : 's';
+            message += `\n\nThe ${count} attachment${plural} from the previous template will be removed and replaced with any new template attachments.`;
+        }
+        return message;
+    }
+
+    async function showTemplateConfirmation() {
+        const result = await Swal.fire({
+            title: 'Apply Template?',
+            text: buildConfirmationMessage(),
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: 'Apply Template',
+            cancelButtonText: 'Cancel'
+        });
+        return result.isConfirmed;
+    }
+
+    async function clearPreviousAttachments(currentEmailId) {
+        if (currentEmailId) {
+            await deleteOriginAttachments(currentEmailId);
+            activeTemplateAttachmentCount = 0;
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+        }
+    }
+
+    async function populateEmailFields(fields, body, templateRecipients) {
+        UIElements.inputEmailSubject.val(fields.subject);
+        if (body) {
+            editorInstance.setContent(body);
+        }
+        UIElements.inputEmailBody.val(body || '');
+        UIElements.inputEmailFrom.val(fields.sendFrom || defaultValues.emailFrom);
+        if (templateRecipients) {
+            UIElements.inputEmailTo.val(templateRecipients).trigger('change');
+        }
+    }
+
     // Helper function to apply a template to the current email
     async function applyTemplateToEmail(template) {
         try {
-            // Get the current email ID from the form field
             const currentEmailId = UIElements.inputEmailId.val();
 
-            // Show confirmation dialog
-            let confirmMessage = 'Selecting a template will revert any changes made to this email.';
-            if (activeTemplateAttachmentCount > 0) {
-                confirmMessage += `\n\nThe ${activeTemplateAttachmentCount} attachment${activeTemplateAttachmentCount === 1 ? '' : 's'} from the previous template will be removed and replaced with any new template attachments.`;
-            }
-
-            const result = await Swal.fire({
-                title: 'Apply Template?',
-                text: confirmMessage,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Apply Template',
-                cancelButtonText: 'Cancel'
-            });
-
-            if (!result.isConfirmed) {
+            if (!await showTemplateConfirmation()) {
                 return;
             }
 
-            // Always clear existing template-origin attachments before applying a new template.
-            // This prevents accumulation when tracking state gets out of sync.
-            if (currentEmailId) {
-                await deleteOriginAttachments(currentEmailId);
-                activeTemplateAttachmentCount = 0;
-                if (emailAttachmentsTable) {
-                    emailAttachmentsTable.ajax.reload();
-                }
-            }
+            await clearPreviousAttachments(currentEmailId);
 
-            // Apply the template
-            const subject = template.subject || template.Subject || '';
-            let body = template.body || template.bodyHTML || template.Body || template.BodyHTML || '';
-            const sendFrom = template.sendFrom || template.SendFrom || '';
+            const fields = extractTemplateFields(template);
+            let body = fields.body;
+            body = await processTemplateBody(body);
 
-            // Process template variables using Handlebars if available
-            if (body && applicationDetails && mappingConfig) {
-                try {
-                    const templateData = extractTemplateData(applicationDetails, mappingConfig);
-                    const handlebarsTemplate = Handlebars.compile(body);
-                    body = handlebarsTemplate(templateData);
-                } catch (e) {
-                    console.warn('Failed to process template variables:', e);
-                }
-            }
+            const templateRecipients = await resolveTemplateRecipientEmailsFromApi(template, fields.id);
+            await populateEmailFields(fields, body, templateRecipients);
 
-            // Apply template to current email being edited
-            UIElements.inputEmailSubject.val(subject);
-            if (body) {
-                editorInstance.setContent(body);
-            }
-            UIElements.inputEmailBody.val(body || '');
-            UIElements.inputEmailFrom.val(sendFrom || defaultValues.emailFrom);
-            const templateRecipients = await resolveTemplateRecipientEmailsFromApi(template, template.id || template.Id);
-            if (templateRecipients) {
-                UIElements.inputEmailTo.val(templateRecipients).trigger('change');
-            }
-            activeTemplateId = template.id || template.Id;
+            activeTemplateId = fields.id;
             activeTemplateAttachmentCount = 0;
-
-            updateSelectedTemplateLabel(template.name || template.Name || 'Unnamed Template', template.id || template.Id);
-
-            // Programmatic field updates do not fire input events; re-evaluate dirty state.
+            updateSelectedTemplateLabel(fields.name, fields.id);
             handleDraftChange();
 
-            // Copy template attachments to the email log
-            const attachmentCount = await copyTemplateAttachments(template.id || template.Id, currentEmailId);
+            const attachmentCount = await copyTemplateAttachments(fields.id, currentEmailId);
             activeTemplateAttachmentCount = attachmentCount;
 
             if (emailAttachmentsTable) {
                 emailAttachmentsTable.ajax.reload();
             }
 
-            await Swal.fire({
-                title: 'Template Applied',
-                text: attachmentCount > 0
-                    ? `${attachmentCount} attachment${attachmentCount === 1 ? '' : 's'} from the template ${attachmentCount === 1 ? 'has' : 'have'} been copied to this email.`
-                    : 'Template applied successfully. No attachments were copied.',
-                icon: 'success',
-                confirmButtonText: 'OK'
-            });
+            const message = buildSuccessMessage(attachmentCount);
+            await showSuccessNotification(message);
         } catch (e) {
             console.error('Failed to apply template:', e);
             abp.notify.error('Failed to apply template. Please try again.');
@@ -2844,3 +2833,52 @@ function createCurrencyFormatter() {
         maximumFractionDigits: 2,
     });
 }
+
+function extractTemplateFields(template) {
+    return {
+        subject: template.subject || template.Subject || '',
+        body: template.body || template.bodyHTML || template.Body || template.BodyHTML || '',
+        sendFrom: template.sendFrom || template.SendFrom || '',
+        id: template.id || template.Id,
+        name: template.name || template.Name || 'Unnamed Template'
+    };
+}
+
+function findTemplateById(templates, templateId) {
+    let selectedTemplate = templates.find(t => t.id === templateId);
+    let useUpperCase = false;
+
+    if (!selectedTemplate) {
+        console.warn('Template not found with camelCase, checking with PascalCase...');
+        console.log('Available template IDs:', templates.map(t => t.id || t.Id));
+        selectedTemplate = templates.find(t => t.Id === templateId);
+        useUpperCase = true;
+    }
+
+    return { selectedTemplate, useUpperCase };
+}
+
+function extractTemplateValues(template, useUpperCase) {
+    const subject = useUpperCase ? template.Subject : template.subject;
+    const body = useUpperCase ? (template.Body || template.BodyHTML) : (template.body || template.bodyHTML);
+    const sendFrom = useUpperCase ? template.SendFrom : template.sendFrom;
+    const name = useUpperCase ? template.Name : template.name;
+    return { subject, body, sendFrom, name };
+}
+
+function buildSuccessMessage(attachmentCount) {
+    const plural = attachmentCount === 1 ? '' : 's';
+    const verbForm = attachmentCount === 1 ? 'has' : 'have';
+    return attachmentCount > 0
+        ? `${attachmentCount} attachment${plural} from the template ${verbForm} been copied to this email.`
+        : 'Template applied successfully. No attachments were copied.';
+}
+
+async function showSuccessNotification(message) {
+    await Swal.fire({
+        title: 'Template Applied',
+        text: message,
+        icon: 'success',
+        confirmButtonText: 'OK'
+    });
+}
\ No newline at end of file

From 7dabfc7bc3115bb80c959b18f9406cde43805e27 Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Wed, 8 Jul 2026 14:35:13 -0700
Subject: [PATCH 9/9] feature/AB#32580-TemplateAttachments

---
 .../NotificationsSettingGroup/Default.js      |  36 +--
 .../Shared/Components/EmailsWidget/Default.js | 229 +++++++++---------
 2 files changed, 124 insertions(+), 141 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
index d0de520f59..03527ab1b4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
@@ -475,8 +475,7 @@ $(function () {
         });
     }
 
-    UiElements.deleteButton.on('click', function () {
-        let templateId = $('#templateId').val();
+    function initiateTemplateDelete(templateId) {
         abp.message.confirm(
             'Are you sure you want to delete this template?',
             'Delete Template',
@@ -486,7 +485,11 @@ $(function () {
                 }
             }
         );
+    }
 
+    UiElements.deleteButton.on('click', function () {
+        const templateId = $('#templateId').val();
+        initiateTemplateDelete(templateId);
     });
 
     function initializeTemplateDataTables() {                
@@ -663,34 +666,7 @@ $(function () {
         $('#TemplatesTable').on('click', '.template-delete-btn', function (e) {
             e.stopPropagation();
             const templateId = $(this).data('id');
-            
-            abp.message.confirm(
-                'Are you sure you want to delete this template?',
-                'Delete Template',
-                function (confirmed) {
-                    if (confirmed) {
-                        $.ajax({
-                            url: `/api/form-notifications/can-delete-template/${templateId}`,
-                            type: 'GET',
-                            success: function (response) {
-                                if (response.canDelete) {
-                                    proceedWithDelete(templateId, function () {
-                                        PubSub.publish('reload_templates_table_with_close');
-                                    });
-                                } else {
-                                    abp.notify.error(response.errorMessage || 'This template cannot be deleted because it is currently in use.');
-                                }
-                            },
-                            error: function () {
-                                // If check fails, proceed with deletion
-                                proceedWithDelete(templateId, function () {
-                                    PubSub.publish('reload_templates_table_with_close');
-                                });
-                            }
-                        });
-                    }
-                }
-            );
+            initiateTemplateDelete(templateId);
         });
 
         // Removed nested functions - now defined at global scope above
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 5ad5c9aa44..c754c01bb6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -81,6 +81,7 @@
     let originalTemplateState = { name: '', id: '' }; // Baseline template for discard restore
     let activeTemplateAttachmentCount = 0; // Track how many attachments were copied from the active template
     let isApplicationEmailContext = true; // Flag to track if we're in application email or template preview context
+    let cachedTemplates = null; // Cache templates globally
     let scheduleState = {
         currentMonth: new Date().getMonth(),
         currentYear: new Date().getFullYear(),
@@ -224,6 +225,7 @@
         defaultValues.emailCC = UIElements.inputOriginalEmailCC.val() || '';
         defaultValues.emailBCC = UIElements.inputOriginalEmailBCC.val() || '';
         if (globalThis.toastr) { toastr.options.positionClass = 'toast-top-center'; }
+        preloadTemplates(); // Pre-fetch templates on page load
         initTemplateDetails();
         $('#templateTextContainer').hide();
         $('#scheduled-delay-section').hide();
@@ -941,16 +943,67 @@
             return;
         }
 
-        const templates = await $.ajax({
-            url: `/api/form-notifications/templates`,
-            type: 'GET'
-        });
+        let templates = cachedTemplates;
+        if (!templates) {
+            try {
+                templates = await $.ajax({
+                    url: `/api/form-notifications/templates`,
+                    type: 'GET'
+                });
+                cachedTemplates = templates;
+            } catch (e) {
+                console.error('Failed to fetch templates:', e);
+                return;
+            }
+        }
 
         if (templates?.length > 0) {
             populateTemplatesSelectOptions($select, templates);
         }
     }
 
+    async function handleTemplateSelectChange($select) {
+        const selectedTemplateId = $select.val();
+        if (!selectedTemplateId) return;
+
+        $select.val('');
+
+        const template = await fetchTemplateById(selectedTemplateId);
+        if (!template) {
+            abp.notify.error('Template not found.');
+            return;
+        }
+
+        await applyTemplateToEmail(template);
+    }
+
+    async function fetchTemplateById(templateId) {
+        let templates = cachedTemplates;
+        if (!templates) {
+            try {
+                templates = await $.ajax({
+                    url: `/api/form-notifications/templates`,
+                    type: 'GET'
+                });
+                cachedTemplates = templates;
+            } catch (e) {
+                console.error('Failed to fetch templates:', e);
+                abp.notify.error('Failed to apply template.');
+                return null;
+            }
+        }
+        return templates.find(t => t.id === templateId || t.Id === templateId);
+    }
+
+    async function handleTemplateSelectOpen($select) {
+        try {
+            await ensureTemplatesSelectOptionsLoaded($select);
+        } catch (err) {
+            console.error('Failed to load templates:', err);
+            abp.notify.error('Failed to load templates.');
+        }
+    }
+
     function updateSelectedTemplateLabel(templateName, templateId) {
         const normalizedTemplateName = normalizeTemplateName(templateName);
         const dropdownLabel = normalizedTemplateName || 'Templates';
@@ -1368,46 +1421,9 @@
                             .prop('hidden', true)
                             .appendTo($templatesSelect);
 
-
-                        // Load templates and populate select
-                        $templatesSelect.on('change', async function () {
-                            const selectedTemplateId = $(this).val();
-
-                            if (!selectedTemplateId) {
-                                return;
-                            }
-
-                            // Reset select to default
-                            $(this).val('');
-
-                            try {
-                                const response = await $.ajax({
-                                    url: `/api/form-notifications/templates`,
-                                    type: 'GET'
-                                });
-
-                                const template = response.find(t => t.id === selectedTemplateId || t.Id === selectedTemplateId);
-
-                                if (template) {
-                                    await applyTemplateToEmail(template);
-                                } else {
-                                    abp.notify.error('Template not found.');
-                                }
-                            } catch (e) {
-                                console.error('Failed to apply template:', e);
-                                abp.notify.error('Failed to apply template.');
-                            }
-                        });
-
-                        // Load templates lazily when opened.
-                        $templatesSelect.on('click', async function (e) {
-                            try {
-                                await ensureTemplatesSelectOptionsLoaded($(this));
-                            } catch (err) {
-                                console.error('Failed to load templates:', err);
-                                abp.notify.error('Failed to load templates.');
-                            }
-                        });
+                        $templatesSelect
+                            .on('change', handleTemplateSelectChange)
+                            .on('click', handleTemplateSelectOpen);
 
                         $menubar.append($templatesSelect);
                     }
@@ -2015,6 +2031,61 @@
 
     let isViewingDraft = false; // Track if we're viewing a draft email
 
+    async function preloadTemplates() {
+        if (cachedTemplates) return;
+        try {
+            cachedTemplates = await $.ajax({
+                url: `/api/form-notifications/templates`,
+                type: 'GET'
+            });
+        } catch (e) {
+            console.warn('Failed to preload templates:', e);
+            cachedTemplates = [];
+        }
+    }
+
+    function createTemplateSelect(selectedRecordTemplateName, isDraft) {
+        const $templatesSelect = $('<select>')
+            .addClass('templates-select templates-button-container')
+            .attr('title', 'Select a template to apply');
+
+        $templatesSelect.prop('disabled', !isDraft);
+
+        $('<option>')
+            .val('')
+            .text(selectedRecordTemplateName || 'Templates')
+            .prop('selected', true)
+            .prop('disabled', true)
+            .prop('hidden', !selectedRecordTemplateName)
+            .appendTo($templatesSelect);
+
+        if (cachedTemplates?.length > 0) {
+            populateTemplatesSelectOptions($templatesSelect, cachedTemplates);
+        }
+
+        return $templatesSelect;
+    }
+
+    function bindTemplateSelectEvents($select, isDraft) {
+        $select.on('change', function () {
+            handleTemplateSelectChangeWithDraftCheck($(this), isDraft);
+        });
+
+        $select.on('click', function (e) {
+            handleTemplateSelectOpenWithDraftCheck($(this), isDraft);
+        });
+    }
+
+    function handleTemplateSelectChangeWithDraftCheck($select, isDraft) {
+        if (!isDraft) return;
+        handleTemplateSelectChange($select);
+    }
+
+    function handleTemplateSelectOpenWithDraftCheck($select, isDraft) {
+        if (!isDraft || $select.prop('disabled')) return;
+        handleTemplateSelectOpen($select);
+    }
+
     PubSub.subscribe('email_selected', (msg, data) => {
         console.log("EMAIL SELECTED EVENT FIRED", data);
 
@@ -2088,78 +2159,14 @@
                 // Create template label and buttons in label container
                 setTimeout(() => {
                     const $menubar = $(editor.getContainer()).find('.tox-menubar');
+                    if (!$menubar.length) return;
 
                     updateSelectedTemplateLabel(selectedRecordTemplateName, activeTemplateId || '');
 
                     // Templates select - add to TinyMCE menu bar at bottom
                     if (!$menubar.find('.templates-button-container').length) {
-                        // Create select element for templates
-                        const $templatesSelect = $('<select>')
-                            .addClass('templates-select templates-button-container')
-                            .attr('title', 'Select a template to apply');
-
-                        // Disable template selection for non-draft emails.
-                        $templatesSelect.prop('disabled', !isDraft);
-
-                        // Keep "Templates" as the control label, but not as a selectable option.
-                        $('<option>')
-                            .val('')
-                            .text(selectedRecordTemplateName || 'Templates')
-                            .prop('selected', true)
-                            .prop('disabled', true)
-                            .prop('hidden', !selectedRecordTemplateName)
-                            .appendTo($templatesSelect);
-
-                        // Load templates and populate select
-                        $templatesSelect.on('change', async function () {
-                            if (!isDraft) {
-                                return;
-                            }
-
-                            const selectedTemplateId = $(this).val();
-
-                            if (!selectedTemplateId) {
-                                return;
-                            }
-
-                            // Reset select to default
-                            $(this).val('');
-
-                            try {
-                                const response = await $.ajax({
-                                    url: `/api/form-notifications/templates`,
-                                    type: 'GET'
-                                });
-
-                                const template = response.find(t => t.id === selectedTemplateId || t.Id === selectedTemplateId);
-
-                                if (template) {
-                                    // Route all template changes through one apply flow so confirmation UX is consistent.
-                                    await applyTemplateToEmail(template);
-                                } else {
-                                    abp.notify.error('Template not found.');
-                                }
-                            } catch (e) {
-                                console.error('Failed to apply template:', e);
-                                abp.notify.error('Failed to apply template.');
-                            }
-                        });
-
-                        // Load templates on first click
-                        $templatesSelect.on('click', async function (e) {
-                            if (!isDraft || $(this).prop('disabled')) {
-                                e.preventDefault();
-                                return;
-                            }
-
-                            try {
-                                await ensureTemplatesSelectOptionsLoaded($(this));
-                            } catch (err) {
-                                console.error('Failed to load templates:', err);
-                                abp.notify.error('Failed to load templates.');
-                            }
-                        });
-
+                        const $templatesSelect = createTemplateSelect(selectedRecordTemplateName, isDraft);
+                        bindTemplateSelectEvents($templatesSelect, isDraft);
                         $menubar.append($templatesSelect);
                     }