diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs
index 3708cad7c..4b13baea0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs
@@ -22,22 +22,74 @@ public class QuestionDto : ExtensibleEntityDto<Guid>
 
         public string? GetMin()
         {
-            return JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}")?.Min.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}");
+                if (def?.Min == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.Min.ToString(), out var minValue))
+                    return minValue.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetMax()
         {
-            return JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}")?.Max.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}");
+                if (def?.Max == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.Max.ToString(), out var maxValue))
+                    return maxValue.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetMinLength()
         {
-            return JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}")?.MinLength.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}");
+                if (def?.MinLength == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.MinLength.ToString(), out var minLength))
+                    return minLength.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetMaxLength()
         {
-            return JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}")?.MaxLength.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}");
+                if (def?.MaxLength == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.MaxLength.ToString(), out var maxLength))
+                    return maxLength.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetYesValue()
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs
index 6d066a23c..16d557583 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs
@@ -9,13 +9,14 @@ public enum PaymentRequestStatus
         L1Pending = 1,
         L1Declined = 2,
         L2Pending = 3,
-        L2Declined  = 4,
-        L3Pending  = 5,
+        L2Declined = 4,
+        L3Pending = 5,
         L3Declined = 6,
         Submitted = 7,
         Validated = 8,
         NotValidated = 9,
         Paid = 10,
-        Failed = 11,
+        Failed = 11,        
+        FSB = 12, // Financial Services Branch - Prevent CAS Payment
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/AccountCodingDto.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/AccountCodingDto.cs
new file mode 100644
index 000000000..be11613b4
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/AccountCodingDto.cs
@@ -0,0 +1,23 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.Payments.PaymentRequests
+{
+    [Serializable]
+    public class AccountCodingDto : AuditedEntityDto<Guid>
+    {
+        public string MinistryClient { get; private set; }
+        public string Responsibility { get; private set; }
+        public string ServiceLine { get; private set; }
+        public string Stob { get; private set; }
+        public string ProjectNumber { get; private set; }
+        public AccountCodingDto()
+        {
+            MinistryClient = string.Empty;
+            Responsibility = string.Empty;
+            ServiceLine = string.Empty;
+            Stob = string.Empty;
+            ProjectNumber = string.Empty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
index c9f6d72bc..e782f3f36 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
@@ -35,6 +35,8 @@ public class PaymentRequestDto : AuditedEntityDto<Guid>
         public string? Note { get; set; }
         public string? ErrorSummary { get; set; }
         public Guid? AccountCodingId { get; set; }
+        public AccountCodingDto? AccountCoding { get; set; }
+        public string AccountCodingDisplay { get; set; } = string.Empty;
         public PaymentUserDto? CreatorUser { get; set; }
         public Collection<PaymentTagDto> PaymentTags { get; set; }
         public  Collection<ExpenseApprovalDto> ExpenseApprovals { get;  set; }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs
index 94f53c92e..4ea6b8752 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs
@@ -10,6 +10,7 @@
 using Unity.Payments.Domain.Exceptions;
 using Unity.Payments.PaymentRequests;
 using Unity.Payments.Domain.PaymentTags;
+using Unity.Payments.Domain.AccountCodings;
 
 namespace Unity.Payments.Domain.PaymentRequests
 {
@@ -60,7 +61,7 @@ public virtual Site Site
         public virtual int? CasHttpStatusCode { get; private set; } = null;
         public virtual string? CasResponse { get; private set; } = string.Empty;
         public virtual Guid? AccountCodingId { get; private set; }
-
+        public virtual AccountCoding? AccountCoding { get; set; } = null;
         public virtual string? Note { get; private set; } = null;
         protected PaymentRequest()
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs
index f98e10420..bccb0910c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs
@@ -7,5 +7,7 @@ namespace Unity.Payments.Domain.Services
     public interface IPaymentsManager
     {
         Task UpdatePaymentStatusAsync(Guid paymentRequestId, PaymentApprovalAction triggerAction);
+        Task<bool> GetFormPreventPaymentStatusByPaymentRequestId(Guid paymentRequestId);
+        Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId);        
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
index 46dde4749..d53a2defe 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
@@ -1,8 +1,10 @@
-using Stateless;
+using Microsoft.EntityFrameworkCore;
+using Stateless;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
 using Unity.Payments.Domain.PaymentRequests;
 using Unity.Payments.Domain.Shared;
 using Unity.Payments.Domain.Workflow;
@@ -16,28 +18,15 @@
 
 namespace Unity.Payments.Domain.Services
 {
-    public class PaymentsManager : DomainService, IPaymentsManager
-    {
-        /* To be implemented */
-        private readonly IPaymentRequestRepository _paymentRequestRepository;
-        private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly IPermissionChecker _permissionChecker;
-        private readonly CasPaymentRequestCoordinator _casPaymentRequestCoordinator;
-        private readonly ICurrentUser _currentUser;
-
-        public PaymentsManager(
+    public class PaymentsManager(
+            IApplicationRepository applicationRepository,
+            IApplicationFormRepository applicationFormRepository,
             CasPaymentRequestCoordinator casPaymentRequestCoordinator,
             IPaymentRequestRepository paymentRequestRepository,
             IUnitOfWorkManager unitOfWorkManager,
             IPermissionChecker permissionChecker,
-            ICurrentUser currentUser)
-        {
-            _casPaymentRequestCoordinator = casPaymentRequestCoordinator;
-            _paymentRequestRepository = paymentRequestRepository;
-            _unitOfWorkManager = unitOfWorkManager;
-            _permissionChecker = permissionChecker;
-            _currentUser = currentUser;
-        }
+            ICurrentUser currentUser) : DomainService, IPaymentsManager
+    {
 
         private void ConfigureWorkflow(StateMachine<PaymentRequestStatus, PaymentApprovalAction> paymentStateMachine)
         {
@@ -67,13 +56,12 @@ private void ConfigureWorkflow(StateMachine<PaymentRequestStatus, PaymentApprova
 
         private bool HasPermission(string permission)
         {
-            return _permissionChecker.IsGrantedAsync(permission).Result;
+            return permissionChecker.IsGrantedAsync(permission).Result;
         }
 
-
         public async Task<List<PaymentActionResultItem>> GetActions(Guid paymentRequestsId)
         {
-            var paymentRequest = await _paymentRequestRepository.GetAsync(paymentRequestsId, true);
+            var paymentRequest = await paymentRequestRepository.GetAsync(paymentRequestsId, true);
 
             var Workflow = new PaymentsWorkflow<PaymentRequestStatus, PaymentApprovalAction>(
                 () => paymentRequest.Status,
@@ -98,8 +86,8 @@ public async Task<List<PaymentActionResultItem>> GetActions(Guid paymentRequests
 
         public async Task<PaymentRequest> TriggerAction(Guid paymentRequestsId, PaymentApprovalAction triggerAction)
         {
-            var paymentRequest = await _paymentRequestRepository.GetAsync(paymentRequestsId, true);
-            var currentUserId = _currentUser.GetId();
+            var paymentRequest = await paymentRequestRepository.GetAsync(paymentRequestsId, true);
+            var currentUserId = currentUser.GetId();
 
             var statusChange = paymentRequest.Status;
 
@@ -114,33 +102,33 @@ public async Task<PaymentRequest> TriggerAction(Guid paymentRequestsId, PaymentA
 
             if (triggerAction == PaymentApprovalAction.L1Approve)
             {
-                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level1);
+                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level1);
                 paymentRequest.ExpenseApprovals[index].Approve(currentUserId);
                 statusChangedTo = PaymentRequestStatus.L2Pending;
             }
             else if (triggerAction == PaymentApprovalAction.L1Decline)
             {
-                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level1);
+                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level1);
                 paymentRequest.ExpenseApprovals[index].Decline(currentUserId);
                 statusChangedTo = PaymentRequestStatus.L1Declined;
             }
             else if (triggerAction == PaymentApprovalAction.L2Approve)
             {
-                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level2);
+                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level2);
                 paymentRequest.ExpenseApprovals[index].Approve(currentUserId);
                 statusChangedTo = PaymentRequestStatus.L3Pending;
 
             }
             else if (triggerAction == PaymentApprovalAction.L2Decline)
             {
-                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level2);
+                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level2);
                 paymentRequest.ExpenseApprovals[index].Decline(currentUserId);
                 statusChangedTo = PaymentRequestStatus.L2Declined;
             }
 
             else if (triggerAction == PaymentApprovalAction.L3Decline)
             {
-                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level3);
+                var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level3);
                 paymentRequest.ExpenseApprovals[index].Decline(currentUserId);
                 statusChangedTo = PaymentRequestStatus.L3Declined;
             }
@@ -149,26 +137,56 @@ public async Task<PaymentRequest> TriggerAction(Guid paymentRequestsId, PaymentA
             {
                 if (HasPermission(PaymentsPermissions.Payments.L2ApproveOrDecline))
                 {
-                    var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level2);
+                    var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level2);
                     paymentRequest.ExpenseApprovals[index].Approve(currentUserId);
                 }
                 else if (HasPermission(PaymentsPermissions.Payments.L3ApproveOrDecline))
                 {
-                    var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == Enums.ExpenseApprovalType.Level3);
+                    var index = paymentRequest.ExpenseApprovals.FindIndex(i => i.Type == ExpenseApprovalType.Level3);
                     paymentRequest.ExpenseApprovals[index].Approve(currentUserId);
                 }
+                bool preventPayment = await GetFormPreventPaymentStatusByApplicationId(paymentRequest.CorrelationId);
 
-                statusChangedTo = PaymentRequestStatus.Submitted;
-                await _casPaymentRequestCoordinator.AddPaymentRequestsToInvoiceQueue(paymentRequest);
+                if (preventPayment)
+                {
+                    statusChangedTo = PaymentRequestStatus.FSB;
+                }
+                else
+                {
+                    statusChangedTo = PaymentRequestStatus.Submitted;
+                    await casPaymentRequestCoordinator.AddPaymentRequestsToInvoiceQueue(paymentRequest);
+                }
+                
+                
             }
             paymentRequest.SetPaymentRequestStatus(statusChangedTo);
 
-            return await _paymentRequestRepository.UpdateAsync(paymentRequest);
+            return await paymentRequestRepository.UpdateAsync(paymentRequest);
+        }
+
+        public async Task<bool> GetFormPreventPaymentStatusByPaymentRequestId(Guid paymentRequestId)
+        {
+            PaymentRequest paymentRequest = await paymentRequestRepository.GetAsync(paymentRequestId);
+            Guid applicationId = paymentRequest.CorrelationId;
+            var applicationQueryable = await applicationRepository.GetQueryableAsync();
+            var applicationWithIncludes = await applicationQueryable.Where(a => a.Id == applicationId)
+                .Include(a => a.ApplicationForm).ToListAsync();
+
+            var appForm = applicationWithIncludes.FirstOrDefault()?.ApplicationForm;
+            return appForm != null && appForm.PreventPayment;
         }
+        
+        public async Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId)
+        {
+            Application application = await applicationRepository.GetAsync(applicationId);
+            Guid formId = application.ApplicationForm.Id;
+            ApplicationForm appForm = await applicationFormRepository.GetAsync(formId);
+            return appForm.PreventPayment;
+        }        
 
         public async Task UpdatePaymentStatusAsync(Guid paymentRequestId, PaymentApprovalAction triggerAction)
         {
-            using var uow = _unitOfWorkManager.Begin();
+            using var uow = unitOfWorkManager.Begin();
 
             await TriggerAction(paymentRequestId, triggerAction);
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
index d33e05d2e..9d41429a1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
@@ -34,6 +34,11 @@ public static void ConfigurePayments(
                 .WithMany()
                 .HasForeignKey(x => x.SiteId)
                 .OnDelete(DeleteBehavior.NoAction);
+
+            b.HasOne(e => e.AccountCoding)
+                .WithMany()
+                .HasForeignKey(x => x.AccountCodingId)
+                .OnDelete(DeleteBehavior.NoAction);                
           
             b.HasIndex(e => e.ReferenceNumber).IsUnique();
         });
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
index 59974d29d..421acc35e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
@@ -25,17 +25,19 @@ namespace Unity.Payments.PaymentRequests
 {
     [RequiresFeature("Unity.Payments")]
     [Authorize]
-    public class PaymentRequestAppService(
-            ICurrentUser currentUser,
-            IDataFilter dataFilter,
-            IExternalUserLookupServiceProvider externalUserLookupServiceProvider,
-            IPaymentConfigurationRepository paymentConfigurationRepository,
-            IPaymentsManager paymentsManager,
-            IPaymentRequestRepository paymentRequestsRepository,
-            IPaymentThresholdRepository paymentThresholdRepository,
-            IPermissionChecker permissionChecker) : PaymentsAppService, IPaymentRequestAppService
-
-    {    
+    #pragma warning disable S107 // Suppress "Constructor has too many parameters"
+        public class PaymentRequestAppService(
+                ICurrentUser currentUser,
+                IDataFilter dataFilter,
+                IExternalUserLookupServiceProvider externalUserLookupServiceProvider,
+                IPaymentConfigurationRepository paymentConfigurationRepository,
+                IPaymentsManager paymentsManager,
+                IPaymentRequestRepository paymentRequestsRepository,
+                IPaymentThresholdRepository paymentThresholdRepository,
+                IPermissionChecker permissionChecker) : PaymentsAppService, IPaymentRequestAppService
+    #pragma warning restore S107
+
+    {
         public async Task<Guid?> GetDefaultAccountCodingId()
         {
             Guid? accountCodingId = null;
@@ -55,12 +57,9 @@ public virtual async Task<List<PaymentRequestDto>> CreateAsync(List<CreatePaymen
             var paymentConfig = await GetPaymentConfigurationAsync();
             var paymentIdPrefix = string.Empty;
 
-            if (paymentConfig != null)
+            if (paymentConfig != null && !paymentConfig.PaymentIdPrefix.IsNullOrEmpty())
             {
-                if (!paymentConfig.PaymentIdPrefix.IsNullOrEmpty())
-                {
-                    paymentIdPrefix = paymentConfig.PaymentIdPrefix;
-                }
+                paymentIdPrefix = paymentConfig.PaymentIdPrefix;
             }
 
             var batchNumber = await GetMaxBatchNumberAsync();
@@ -313,13 +312,14 @@ await paymentRequestsRepository
                 var paymentsQueryable = await paymentRequestsRepository.GetQueryableAsync();
                 // Changing this breaks the code so suppressing the warning
 #pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
-                var paymentsWithTags = await paymentsQueryable
+                var paymentWithIncludes = await paymentsQueryable
+                    .Include(pr => pr.AccountCoding)
                     .Include(pr => pr.PaymentTags)
                         .ThenInclude(pt => pt.Tag)
                     .ToListAsync();
 #pragma warning restore CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
 
-                var mappedPayments = await MapToDtoAndLoadDetailsAsync(paymentsWithTags);
+                var mappedPayments = await MapToDtoAndLoadDetailsAsync(paymentWithIncludes);
 
                 ApplyErrorSummary(mappedPayments);
 
@@ -366,6 +366,7 @@ protected internal async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsy
                 {
                     paymentRequestDto.CreatorUser = paymentRequestUserDto;
                 }
+                paymentRequestDto.AccountCodingDisplay = await GetAccountDistributionCode(paymentRequestDto.AccountCoding);
 
                 foreach (var expenseApproval in paymentRequestDto.ExpenseApprovals)
                 {
@@ -380,6 +381,25 @@ protected internal async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsy
             return paymentDtos;
         }
 
+        public virtual Task<string> GetAccountDistributionCode(AccountCodingDto? accountCoding)
+        {
+            string accountDistributionCode = "";
+            if (accountCoding == null) return Task.FromResult(accountDistributionCode);
+
+            if (accountCoding.Responsibility != null
+                && accountCoding.ServiceLine != null
+                && accountCoding.Stob != null
+                && accountCoding.MinistryClient != null
+                && accountCoding.ProjectNumber != null)
+            {
+                const string DefaultAccountDistributionPostfix = "000000.0000";
+                accountDistributionCode =
+                 $"{accountCoding.MinistryClient}.{accountCoding.Responsibility}.{accountCoding.ServiceLine}.{accountCoding.Stob}.{accountCoding.ProjectNumber}.{DefaultAccountDistributionPostfix}";
+            }
+
+            return Task.FromResult(accountDistributionCode);
+        }
+
         private static void ApplyErrorSummary(List<PaymentRequestDto> mappedPayments)
         {
             mappedPayments.ForEach(mappedPayment =>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentTags/PaymentTagAppService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentTags/PaymentTagAppService.cs
index 2e0eb04c4..50188c4ff 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentTags/PaymentTagAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentTags/PaymentTagAppService.cs
@@ -6,12 +6,12 @@
 using System.Threading.Tasks;
 using Unity.Modules.Shared;
 using Unity.Payments.Domain.PaymentTags;
+using Unity.Payments.Events;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Features;
 using Volo.Abp.EventBus.Local;
-using Unity.Payments.Events;
+using Volo.Abp.Features;
 
 
 namespace Unity.Payments.PaymentTags
@@ -51,13 +51,11 @@ public async Task<IList<PaymentTagDto>> GetListWithPaymentRequestIdsAsync(List<G
 
             return ObjectMapper.Map<PaymentTag, PaymentTagDto>(paymentTags);
         }
-       
+
 
         public async Task<List<PaymentTagDto>> AssignTagsAsync(AssignPaymentTagDto input)
         {
             var existingApplicationTags = await _paymentTagRepository.GetListAsync(e => e.PaymentRequestId == input.PaymentRequestId);
-
-            
             var existingTagIds = existingApplicationTags.Select(t => t.TagId).ToHashSet();
             var inputTagIds = input.Tags?.Select(t => t.Id).ToHashSet() ?? new HashSet<Guid>();
             var newTagsToAdd = input.Tags?
@@ -68,17 +66,17 @@ public async Task<List<PaymentTagDto>> AssignTagsAsync(AssignPaymentTagDto input
                     TagId = tag.Id
                 })
                 .ToList();
+            
             var tagsToRemove = existingApplicationTags
-           .Where(et => !inputTagIds.Contains(et.TagId))
-            .ToList();
-
+                .Where(et => !inputTagIds.Contains(et.TagId))
+                .ToList();
 
-            if (tagsToRemove.Count > 0)
+            if (tagsToRemove.Count > 0 && await AuthorizationService.IsGrantedAsync(UnitySelector.Payment.Tags.Delete))
             {
                 await _paymentTagRepository.DeleteManyAsync(tagsToRemove, autoSave: true);
             }
-            
-            if (newTagsToAdd?.Count > 0)
+
+            if (newTagsToAdd?.Count > 0 && await AuthorizationService.IsGrantedAsync(UnitySelector.Payment.Tags.Create))
             {
                 await _paymentTagRepository.InsertManyAsync(newTagsToAdd, autoSave: true);
                 var tagIds = newTagsToAdd.Select(x => x.TagId).ToList();
@@ -92,7 +90,7 @@ public async Task<List<PaymentTagDto>> AssignTagsAsync(AssignPaymentTagDto input
             }
             else
             {
-                return new List<PaymentTagDto>();
+                return [];
             }
         }
 
@@ -161,12 +159,12 @@ public async Task<List<Guid>> RenameTagAsync(string originalTag, string replacem
         /// </summary>
         /// <param name="deleteTag">String of tag to be deleted.</param>
         [Authorize(UnitySelector.SettingManagement.Tags.Delete)]
-        public async Task DeleteTagAsync(Guid id )
+        public async Task DeleteTagAsync(Guid id)
         {
-           await _paymentTagRepository.DeleteAsync(id);
-        } 
-        
-        
+            await _paymentTagRepository.DeleteAsync(id);
+        }
+
+
         [Authorize(UnitySelector.SettingManagement.Tags.Delete)]
         public async Task DeleteTagWithTagIdAsync(Guid tagId)
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentsApplicationAutoMapperProfile.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentsApplicationAutoMapperProfile.cs
index 19c00f440..f437fd146 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentsApplicationAutoMapperProfile.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentsApplicationAutoMapperProfile.cs
@@ -23,7 +23,9 @@ public class PaymentsApplicationAutoMapperProfile : Profile
     public PaymentsApplicationAutoMapperProfile()
     {
         CreateMap<PaymentRequest, PaymentRequestDto>()
-            .ForMember(dest => dest.ErrorSummary, options => options.Ignore())
+            .ForMember(dest => dest.ErrorSummary, opt => opt.Ignore())
+            .ForMember(dest => dest.AccountCoding, opt => opt.MapFrom(src => src.AccountCoding))
+            .ForMember(dest => dest.AccountCodingDisplay, opt => opt.Ignore())
             .ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.Site))
             .ForMember(dest => dest.CreatorUser, opt => opt.Ignore())
             .ForMember(dest => dest.PaymentTags, opt => opt.MapFrom(src => src.PaymentTags));
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs
index b87ae9d82..8f9610d1b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs
@@ -1,56 +1,65 @@
-using Unity.Modules.Shared;
-using Unity.Payments.Localization;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
-
-namespace Unity.Payments.Permissions;
-
-public class PaymentsPermissionDefinitionProvider : PermissionDefinitionProvider
-{
-    public override void Define(IPermissionDefinitionContext context)
-    {
-        var grantApplicationPermissionsGroup = context.AddGroup(PaymentsPermissions.GroupName, L("Permission:Payments"));
-
-        // Payment Requests
-        var paymentsPermissions = grantApplicationPermissionsGroup.AddPermission(PaymentsPermissions.Payments.Default, L("Permission:Payments.Default"));
-        paymentsPermissions.AddChild(PaymentsPermissions.Payments.L1ApproveOrDecline, L("Permission:Payments.L1ApproveOrDecline"));
-        paymentsPermissions.AddChild(PaymentsPermissions.Payments.L2ApproveOrDecline, L("Permission:Payments.L2ApproveOrDecline"));
-        paymentsPermissions.AddChild(PaymentsPermissions.Payments.L3ApproveOrDecline, L("Permission:Payments.L3ApproveOrDecline"));
-        paymentsPermissions.AddChild(PaymentsPermissions.Payments.RequestPayment, L("Permission:Payments.RequestPayment"));
-
-        //-- PAYMENT INFO PERMISSIONS
-        grantApplicationPermissionsGroup.Add_PaymentInfo_Permissions();
-        paymentsPermissions.AddChild(PaymentsPermissions.Payments.EditFormPaymentConfiguration, L("Permission:Payments.EditFormPaymentConfiguration"));        
-    }
-
-    private static LocalizableString L(string name)
-    {
-        return LocalizableString.Create<PaymentsResource>(name);
-    }
-}
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S1481:Unused local variables should be removed", Justification = "Configuration Code")]
-public static class PaymentPermissionGroupDefinitionExtensions
-{
-    public static void Add_PaymentInfo_Permissions(this PermissionGroupDefinition grantApplicationPermissionsGroup)
-    {
-        #region PAYMENT INFO GRANULAR PERMISSIONS
-        var upx_Payment                                     = grantApplicationPermissionsGroup
-                                                                                    .AddPermission(UnitySelector.Payment.Default, LocalizableString.Create<PaymentsResource>(UnitySelector.Payment.Default));
-
-        var upx_Payment_Summary                             = upx_Payment.AddPaymentChild(UnitySelector.Payment.Summary.Default);
-
-        var upx_Payment_Supplier                            = upx_Payment.AddPaymentChild(UnitySelector.Payment.Supplier.Default);
-        var upx_Payment_Supplier_Update                     = upx_Payment_Supplier.AddPaymentChild(UnitySelector.Payment.Supplier.Update);
-
-        var upx_PaymentList_Authority                       = upx_Payment.AddPaymentChild(UnitySelector.Payment.PaymentList.Default);
-        #endregion
-    }
-
-
-
-    public static PermissionDefinition AddPaymentChild(this PermissionDefinition parent, string name)
-    {
-        return parent.AddChild(name, LocalizableString.Create<PaymentsResource>(name));
-    }
-}
+using Unity.Modules.Shared;
+using Unity.Payments.Localization;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Features;
+using Volo.Abp.Localization;
+
+namespace Unity.Payments.Permissions;
+
+public class PaymentsPermissionDefinitionProvider : PermissionDefinitionProvider
+{
+    public override void Define(IPermissionDefinitionContext context)
+    {
+        var grantApplicationPermissionsGroup = context.AddGroup(PaymentsPermissions.GroupName, L("Permission:Payments"));
+
+        // Payment Requests
+        var paymentsPermissions = grantApplicationPermissionsGroup.AddPermission(PaymentsPermissions.Payments.Default, L("Permission:Payments.Default"));
+        paymentsPermissions.AddChild(PaymentsPermissions.Payments.L1ApproveOrDecline, L("Permission:Payments.L1ApproveOrDecline"));
+        paymentsPermissions.AddChild(PaymentsPermissions.Payments.L2ApproveOrDecline, L("Permission:Payments.L2ApproveOrDecline"));
+        paymentsPermissions.AddChild(PaymentsPermissions.Payments.L3ApproveOrDecline, L("Permission:Payments.L3ApproveOrDecline"));
+        paymentsPermissions.AddChild(PaymentsPermissions.Payments.RequestPayment, L("Permission:Payments.RequestPayment"));
+
+        //-- PAYMENT INFO PERMISSIONS
+        grantApplicationPermissionsGroup.Add_PaymentInfo_Permissions();
+        paymentsPermissions.AddChild(PaymentsPermissions.Payments.EditFormPaymentConfiguration, L("Permission:Payments.EditFormPaymentConfiguration"));        
+
+        var tagsPermissionsGroup = context.GetGroupOrNull("Tags");
+        if (tagsPermissionsGroup != null)
+        {
+            tagsPermissionsGroup.AddPermission(UnitySelector.Payment.Tags.Create, L(UnitySelector.Payment.Tags.Create)).RequireFeatures("Unity.Payments");
+            tagsPermissionsGroup.AddPermission(UnitySelector.Payment.Tags.Delete, L(UnitySelector.Payment.Tags.Delete)).RequireFeatures("Unity.Payments");
+        }
+    }
+
+    private static LocalizableString L(string name)
+    {
+        return LocalizableString.Create<PaymentsResource>(name);
+    }
+}
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S1481:Unused local variables should be removed", Justification = "Configuration Code")]
+public static class PaymentPermissionGroupDefinitionExtensions
+{
+    public static void Add_PaymentInfo_Permissions(this PermissionGroupDefinition grantApplicationPermissionsGroup)
+    {
+        #region PAYMENT INFO GRANULAR PERMISSIONS
+        var upx_Payment                                     = grantApplicationPermissionsGroup
+                                                                                    .AddPermission(UnitySelector.Payment.Default, LocalizableString.Create<PaymentsResource>(UnitySelector.Payment.Default))
+                                                                                    .RequireFeatures("Unity.Payments");
+
+        var upx_Payment_Summary                             = upx_Payment.AddPaymentChild(UnitySelector.Payment.Summary.Default);
+
+        var upx_Payment_Supplier                            = upx_Payment.AddPaymentChild(UnitySelector.Payment.Supplier.Default);
+        var upx_Payment_Supplier_Update                     = upx_Payment_Supplier.AddPaymentChild(UnitySelector.Payment.Supplier.Update);
+
+        var upx_PaymentList_Authority                       = upx_Payment.AddPaymentChild(UnitySelector.Payment.PaymentList.Default);
+        #endregion
+    }
+
+
+
+    public static PermissionDefinition AddPaymentChild(this PermissionDefinition parent, string name)
+    {
+        return parent.AddChild(name, LocalizableString.Create<PaymentsResource>(name)).RequireFeatures("Unity.Payments");
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
index c57a1d77e..6d2d0da0b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
@@ -129,6 +129,7 @@
     "Enum:PaymentRequestStatus.L3Approved": "L3 Approved",
     "Enum:PaymentRequestStatus.L3Declined": "L3 Declined",
     "Enum:PaymentRequestStatus.Submitted": "Submitted to CAS",
+    "Enum:PaymentRequestStatus.FSB": "Sent to Accounts Payable",
     "Enum:PaymentRequestStatus.Validated": "Validated",
     "Enum:PaymentRequestStatus.NotValidated": "Not Validated",
     "Enum:PaymentRequestStatus.Paid": "Paid",
@@ -139,6 +140,9 @@
     "Unity.GrantManager.ApplicationManagement.Payment.Summary": "Payment Summary",
     "Unity.GrantManager.ApplicationManagement.Payment.Supplier": "Supplier Info",
     "Unity.GrantManager.ApplicationManagement.Payment.Supplier.Update": "Edit Supplier Info",
-    "Unity.GrantManager.ApplicationManagement.Payment.PaymentList": "Payment List"
+    "Unity.GrantManager.ApplicationManagement.Payment.PaymentList": "Payment List",
+
+    "Unity.Payments.Tags.Create": "Assign Tag to Payments",
+    "Unity.Payments.Tags.Delete": "Remove Tag from Payments"
   }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml.cs
index 8376e5f1d..58a57638f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using Unity.GrantManager.Payments;
+using Unity.Payments.PaymentRequests;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Unity.Payments.Web.Pages.AccountCoding;
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs
index c4cbd61a5..c4a2fc1b3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Unity.GrantManager.ApplicationForms;
 using Unity.Payments.Domain.PaymentRequests;
+using Unity.Payments.Domain.Services;
 using Unity.Payments.Domain.Shared;
 using Unity.Payments.Enums;
 using Unity.Payments.PaymentConfigurations;
@@ -24,6 +25,7 @@ public class PaymentGrouping
     }
 
     public class UpdatePaymentRequestStatus(
+                        IPaymentsManager paymentsManager,
                         IPaymentRequestAppService paymentRequestAppService,
                         IApplicationFormAppService applicationFormAppService,
                         IPaymentRequestRepository paymentRepository,
@@ -73,8 +75,6 @@ private async Task InitializeStateAsync(string paymentIds, bool isApprove)
             HasPaymentConfiguration = await paymentConfigurationAppService.GetAsync() != null;
         }
 
-
-
         private async Task<List<PaymentsApprovalModel>> BuildPaymentApprovalsAsync(List<PaymentDetailsDto> payments)
         {
             var paymentApprovals = new List<PaymentsApprovalModel>();
@@ -137,13 +137,11 @@ private async Task UpdateExpenseApprovalsAsync(PaymentDetailsDto payment, bool i
         {
             if (payment.Status == PaymentRequestStatus.L2Pending)
             {
-
                 var l3Approval = payment.ExpenseApprovals.FirstOrDefault(x => x.Type == ExpenseApprovalType.Level3);
                 PaymentRequest paymentEntity = await paymentRepository.GetAsync(payment.Id);
                 if (isL3ApprovalRequired && l3Approval == null)
                 {
                     paymentEntity.ExpenseApprovals.Add(new ExpenseApproval(Guid.NewGuid(), ExpenseApprovalType.Level3));
-
                 }
                 else if (!isL3ApprovalRequired && l3Approval != null)
                 {
@@ -174,30 +172,45 @@ private void ValidateApprovalModel(PaymentsApprovalModel request)
 
         private async Task<bool> VerifyPermissionsAsync(PaymentRequestStatus status, PaymentsApprovalModel request)
         {
-            if (status == PaymentRequestStatus.L2Pending && IsApproval)
-            {
-                request.ToStatus = request.IsL3ApprovalRequired ? PaymentRequestStatus.L3Pending : PaymentRequestStatus.Submitted;
-            }
-            else
+            bool preventPayment = await paymentsManager.GetFormPreventPaymentStatusByPaymentRequestId(request.Id);
+            request.ToStatus = GetNextStatus(status, request, preventPayment, IsApproval);
+            var permission = GetRequiredPermission(status);
+            return permission != null && await permissionCheckerService.IsGrantedAsync(permission);
+        }
+
+        private static PaymentRequestStatus GetNextStatus(PaymentRequestStatus status, PaymentsApprovalModel request, bool preventPayment, bool isApproval)
+        {
+            if (status == PaymentRequestStatus.L2Pending && isApproval)
             {
-                request.ToStatus = status switch
+                if (request.IsL3ApprovalRequired)
                 {
-                    PaymentRequestStatus.L1Pending => IsApproval ? PaymentRequestStatus.L2Pending : PaymentRequestStatus.L1Declined,
-                    PaymentRequestStatus.L2Pending => PaymentRequestStatus.L2Declined,
-                    PaymentRequestStatus.L3Pending => IsApproval ? PaymentRequestStatus.Submitted : PaymentRequestStatus.L3Declined,
-                    _ => request.ToStatus
-                };
+                    return PaymentRequestStatus.L3Pending;
+                }
+                if (preventPayment)
+                {
+                    return PaymentRequestStatus.FSB;
+                }
+                return PaymentRequestStatus.Submitted;
             }
 
-            var permission = status switch
+            return status switch
+            {
+                PaymentRequestStatus.L1Pending => isApproval ? PaymentRequestStatus.L2Pending : PaymentRequestStatus.L1Declined,
+                PaymentRequestStatus.L2Pending => PaymentRequestStatus.L2Declined,
+                PaymentRequestStatus.L3Pending => isApproval ? PaymentRequestStatus.Submitted : PaymentRequestStatus.L3Declined,
+                _ => request.ToStatus
+            };
+        }
+
+        private static string? GetRequiredPermission(PaymentRequestStatus status)
+        {
+            return status switch
             {
                 PaymentRequestStatus.L1Pending => PaymentsPermissions.Payments.L1ApproveOrDecline,
                 PaymentRequestStatus.L2Pending => PaymentsPermissions.Payments.L2ApproveOrDecline,
                 PaymentRequestStatus.L3Pending => PaymentsPermissions.Payments.L3ApproveOrDecline,
                 _ => null
             };
-
-            return permission != null && await permissionCheckerService.IsGrantedAsync(permission);
         }
 
         public async Task<IActionResult> OnPostAsync()
@@ -249,6 +262,7 @@ public static string GetStatusText(PaymentRequestStatus status)
                 "L3Approved" => "L3 Approved",
                 "L3Declined" => "L3 Declined",
                 "Submitted" => "Submitted to CAS",
+                "FSB" => "Sent to Accounts Payable",
                 "Paid" => "Paid",
                 "PaymentFailed" => "Payment Failed",
                 _ => "L1 Pending",
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatusModal.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatusModal.js
index 8026351fd..f1fe8946b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatusModal.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatusModal.js
@@ -94,6 +94,9 @@ function getStatusText(data) {
 
         case "Submitted":
             return "Submitted";
+            
+        case "FSB":
+            return "Sent to Accounts Payable";
 
         case "Paid":
             return "Paid";
@@ -101,7 +104,6 @@ function getStatusText(data) {
         case "PaymentFailed":
             return "Payment Failed"
 
-
         default:
             return "Created";
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
index eacb87611..83d814a23 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
@@ -25,7 +25,8 @@ $(function () {
         'l1ApprovalDate',
         'l2ApprovalDate',
         'l3ApprovalDate',
-        'CASResponse'
+        'CASResponse',
+        'accountCodingDisplay'
     ];
 
     let paymentRequestStatusModal = new abp.ModalManager({
@@ -293,7 +294,8 @@ $(function () {
             getPaymentStatusColumn(columnIndex++),
             getCASResponseColumn(columnIndex++),
             getTagsColumn(columnIndex++),
-            getNoteColumn(columnIndex++)
+            getNoteColumn(columnIndex++),
+            getAccountDistributionColumn(columnIndex++),
         ]
 
         return columns.map((column) => ({ ...column, targets: [column.index], orderData: [column.index, 0] }));
@@ -531,7 +533,7 @@ $(function () {
     }
 
     function formatName(userData) {
-        return userData !== null ? `${userData?.name} ${userData?.surname}` : null;
+        return typeof userData !== 'undefined' && userData !== null ? `${userData?.name} ${userData?.surname}` : "";
     }
 
     function getApprovalDateColumn(columnIndex, level) {
@@ -637,6 +639,17 @@ $(function () {
         };
     }
 
+    function getAccountDistributionColumn(columnIndex) {
+        return {
+            title: 'Account Code',
+            name: 'accountCodingDisplay',
+            data: 'accountCodingDisplay',
+            className: 'data-table-header',
+            index: columnIndex
+
+        };
+    }
+
     function getExpenseApprovalsDetails(expenseApprovals, type) {
         return expenseApprovals.find(x => x.type == type);
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTags.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTags.js
index 70ab08e94..1982933b0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTags.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTags.js
@@ -2,12 +2,11 @@ $(function () {
 
     let suggestionsArray = [];
 
-    
     let TagsInput = function (opts) {
         this.options = Object.assign(TagsInput.defaults, opts);
         this.init();
     }
-    
+
     TagsInput.prototype.init = function (opts) {
         this.options = opts ? Object.assign(this.options, opts) : this.options;
 
@@ -24,15 +23,21 @@ $(function () {
 
         this.wrapper = document.createElement('div');
         this.input = document.createElement('input');
+        this.input.id = "tags-input-control";
         init(this);
         initEvents(this);
 
+        // Disable the input if user doesn't have create permission
+        if (!abp.auth.isGranted('Unity.Payments.Tags.Create')) {
+            this.input.disabled = true;
+            this.input.type = "hidden";
+            this.wrapper.classList.add('tags-input-disabled');
+        }
+
         this.initialized = true;
         return this;
     }
 
-
-    
     TagsInput.prototype.addTag = function (tagData) {
         let defaultClass = 'tags-common';
         let id, tagText, tagClass;
@@ -41,8 +46,6 @@ $(function () {
         tagText = tagData.name || '';
         tagClass = tagData.class || defaultClass;
 
-
-
         if (this.anyErrors(tagText))
             return;
 
@@ -54,38 +57,40 @@ $(function () {
         tag.className = this.options.tagClass + ' ' + tagClass;
         tag.innerText = tagText;
 
-        let closeIcon = document.createElement('a');
-        closeIcon.innerHTML = '&times;';
+        if (abp.auth.isGranted('Unity.Payments.Tags.Delete')) {
+            let closeIcon = document.createElement('a');
+            closeIcon.innerHTML = '&times;';
+
+            closeIcon.addEventListener('click', function (e) {
+                e.preventDefault();
+                let tag = this.parentNode;
 
-        
-        closeIcon.addEventListener('click', function (e) {
-            e.preventDefault();
-            let tag = this.parentNode;
+                let tagIndex = Array.from(tagInput.wrapper.childNodes).indexOf(tag);
+                if (tagIndex !== -1) {
+                    tagInput.deleteTag(tag, tagIndex);
+                }
+            })
 
-            for (let i = 0; i < tagInput.wrapper.childNodes.length; i++) {
-                if (tagInput.wrapper.childNodes[i] == tag)
-                    tagInput.deleteTag(tag, i);
-            }
-        })
+            tag.appendChild(closeIcon);
+        }
 
-        tag.appendChild(closeIcon);
         this.wrapper.insertBefore(tag, this.input);
         this.orignal_input.value = JSON.stringify(this.arr);
         updateSelectedTagsInput(this.arr)
         return this;
     }
 
-    
     TagsInput.prototype.deleteTag = function (tag, i) {
         let self = this;
 
-        if (this.arr[i].name === 'Uncommon Tags') {
+        if (this.arr[i] && this.arr[i].name === 'Uncommon Tags') {
             abp.message.confirm('Are you sure you want to delete all the uncommon tags?')
                 .then(function (confirmed) {
                     if (confirmed) {
                         tag.remove();
                         self.arr.splice(i, 1);
                         self.orignal_input.value = JSON.stringify(self.arr);
+                        updateSelectedTagsInput(self.arr);
                         return self;
                     }
                 });
@@ -93,11 +98,11 @@ $(function () {
             tag.remove();
             this.arr.splice(i, 1);
             this.orignal_input.value = JSON.stringify(this.arr);
+            updateSelectedTagsInput(this.arr);
             return this;
         }
     }
 
-    
     TagsInput.prototype.anyErrors = function (string) {
         if (this.options.max != null && this.arr.length >= this.options.max) {
             console.log('max tags limit reached');
@@ -115,7 +120,6 @@ $(function () {
         return false;
     }
 
-    
     TagsInput.prototype.addData = function (array) {
         let plugin = this;
 
@@ -125,17 +129,14 @@ $(function () {
         return this;
     }
 
-   
     TagsInput.prototype.getInputString = function () {
         return this.arr.join(',');
     }
-    TagsInput.prototype.setSuggestions = function (sugArray) {
 
+    TagsInput.prototype.setSuggestions = function (sugArray) {
         suggestionsArray = sugArray;
     }
 
-
-    
     TagsInput.prototype.destroy = function () {
         this.orignal_input.removeAttribute('hidden');
 
@@ -153,7 +154,6 @@ $(function () {
         this.initialized = false;
     }
 
-    
     function init(tags) {
         tags.wrapper.append(tags.input);
         tags.wrapper.classList.add(tags.options.wrapperClass);
@@ -162,45 +162,35 @@ $(function () {
         tags.input.addEventListener('input', function () {
             const inputValue = tags.input.value.trim().toLowerCase();
 
-           
             if (inputValue.length > 1) {
                 const suggestions = suggestionsArray.filter(tag =>
                     (tag.name.toLowerCase()).includes(inputValue));
 
-                
                 if (suggestions.length) {
                     displaySuggestions(tags, suggestions);
                 } else {
                     removeSuggestions(tags);
                 }
-
             } else {
-               
                 removeSuggestions(tags);
             }
         });
     }
 
-   
     function displaySuggestions(tags, suggestions) {
-        
+
         removeSuggestions(tags);
 
-        
         const suggestionContainer = document.createElement('div');
         suggestionContainer.classList.add('tags-suggestion-container');
         const suggestionTitleElement = document.createElement('div');
         suggestionTitleElement.className = 'tags-suggestion-title';
         suggestionTitleElement.innerText = 'ALL TAGS';
         suggestionContainer.appendChild(suggestionTitleElement);
-
-        
         suggestions.forEach(suggestion => {
             const suggestionElement = document.createElement('div');
             suggestionElement.className = 'tags-suggestion-element';
             suggestionElement.innerText = typeof suggestion === 'string' ? suggestion : suggestion.name;
-
-           
             suggestionElement.addEventListener('click', function () {
                 tags.addTag(suggestion);
                 removeSuggestions(tags);
@@ -210,11 +200,9 @@ $(function () {
             suggestionContainer.appendChild(suggestionElement);
         });
 
-        
         tags.wrapper.appendChild(suggestionContainer);
     }
 
-    
     function removeSuggestions(tags) {
         const suggestionContainer = tags.wrapper.querySelector('.tags-suggestion-container');
         if (suggestionContainer) {
@@ -222,33 +210,27 @@ $(function () {
         }
     }
 
-    // initialize the Events
     function initEvents(tags) {
         tags.wrapper.addEventListener('click', function () {
             tags.input.focus();
         });
 
-       
         tags.input.addEventListener('focusout', function () {
             $('#assignTagsModelSaveBtn').click(function () {
                 trimAndAddTag(tags);
             })
         });
 
-
         tags.input.addEventListener('keydown', function (e) {
-
             if (~[9, 13, 188, 32].indexOf(e.keyCode)) {
                 e.preventDefault();
                 trimAndAddTag(tags);
                 removeSuggestions(tags);
 
             }
-
         });
     }
 
-    
     function trimAndAddTag(tags) {
         let str = tags.input.value.trim();
         if (!str) {
@@ -256,9 +238,7 @@ $(function () {
             return;
         }
 
-        
         const matched = suggestionsArray.find(s =>
-
             s.name.toLowerCase() === str.toLowerCase()
         );
 
@@ -272,17 +252,14 @@ $(function () {
     }
 
     function updateSelectedTagsInput(tagsArray) {
-
         let jsonValue = JSON.stringify(tagsArray);
         $('#SelectedTagsJson').val(jsonValue);
-
     }
 
     TagsInput.prototype.getTags = function () {
         return this.arr.slice(); // Return a copy of the array to prevent external modification
     }
 
-   
     TagsInput.defaults = {
         selector: '',
         wrapperClass: 'tags-input-wrapper',
@@ -292,5 +269,4 @@ $(function () {
     }
 
     window.TagsInput = TagsInput;
-
 });
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml
index fe9adc773..1bac0ad24 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml
@@ -1,10 +1,16 @@
 @page
-@model Unity.Payments.Web.Pages.PaymentTags.PaymentTagsSelectionModalModel
+@using Newtonsoft.Json
+@using Unity.Modules.Shared
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Volo.Abp.Authorization.Permissions
+
+@model Unity.Payments.Web.Pages.PaymentTags.PaymentTagsSelectionModalModel
+
 @{
     Layout = null;
 }
-@using Newtonsoft.Json
+
+@inject IPermissionChecker PermissionChecker
 
 <form method="post" asp-page-handler="OnPostAsync" data-check-form-on-close="false" id="paymentTagForm">
     <abp-modal id="tagPaymentsModal">
@@ -12,6 +18,16 @@
         <abp-modal-body>
             <div>
                 <abp-input type="text" id="SelectedTags" asp-for="@Model.SelectedTags" />
+                @if (!await PermissionChecker.IsGrantedAsync(UnitySelector.Payment.Tags.Create))
+                {
+                    <div class="form-text"><strong>Note: </strong>The current user does not have permission to assign payment tags.</div>
+                }
+
+                @if (!await PermissionChecker.IsGrantedAsync(UnitySelector.Payment.Tags.Delete))
+                {
+                    <div class="form-text"><strong>Note: </strong>The current user does not have permission to remove payment tags.</div>
+                }
+
                 <input type="hidden" id="SelectedTagsJson" name="SelectedTagsJson" />
                 <abp-input type="hidden" id="SelectedPaymentRequestIds" asp-for="@Model.SelectedPaymentRequestIds" />
                 <abp-input type="hidden" id="ActionType" asp-for="@Model.ActionType" />
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml.cs
index 2df0bdbe5..f76115591 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentTags/PaymentTagsSelectionModal.cshtml.cs
@@ -1,11 +1,11 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using Unity.GrantManager.GlobalTag;
 using Unity.Payments.PaymentTags;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
@@ -38,8 +38,6 @@ public class PaymentTagsSelectionModalModel : AbpPageModel
         public string? ActionType { get; set; } = string.Empty;
 
         private readonly IPaymentTagAppService _paymentTagsService;
-        private readonly ITagsService _tagsService;
-
 
         [BindProperty]
         [DisplayName("Common Tags")]
@@ -54,28 +52,22 @@ public class PaymentTagsSelectionModalModel : AbpPageModel
         public List<NewTagItem> Tags { get; set; } = new();
 
         [BindProperty]
-        public string? SelectedTagsJson { get; set; } 
+        public string? SelectedTagsJson { get; set; }
 
         [BindProperty]
         public string? TagsJson { get; set; }
 
-
-        public PaymentTagsSelectionModalModel(IPaymentTagAppService paymentTagAppService, ITagsService tagsService)
+        public PaymentTagsSelectionModalModel(IPaymentTagAppService paymentTagAppService)
         {
             _paymentTagsService = paymentTagAppService ?? throw new ArgumentNullException(nameof(paymentTagAppService));
-            _tagsService = tagsService ?? throw new ArgumentNullException(nameof(tagsService));
-
         }
 
-        public  Task OnGetAsync(string paymentRequestIds, string actionType)
+        public Task OnGetAsync(string paymentRequestIds, string actionType)
         {
-           
             SelectedPaymentRequestIds = paymentRequestIds;
             ActionType = actionType;
 
-
             return Task.CompletedTask;
-
         }
 
         public async Task<IActionResult> OnPostAsync()
@@ -88,7 +80,7 @@ public async Task<IActionResult> OnPostAsync()
                 var paymentRequestIds = JsonConvert.DeserializeObject<List<Guid>>(SelectedPaymentRequestIds);
                 if (SelectedTags != null)
                 {
-               
+
                     var selectedTagList = DeserializeJson<List<TagDto>>(SelectedTags) ?? [];
                     if (null != paymentRequestIds)
                     {
@@ -118,8 +110,8 @@ private async Task ProcessTagsAsync(string uncommonTagsLabel, List<TagDto> selec
             for (int i = 0; i < selectedPaymentRequestIds.Length; i++)
             {
                 var item = selectedPaymentRequestIds[i];
-               
-                 var tagList = new List<GlobalTagDto>();
+
+                var tagList = new List<GlobalTagDto>();
                 if (tags != null
                     && tags.Count > 0
                     && selectedTags != null
@@ -130,7 +122,7 @@ private async Task ProcessTagsAsync(string uncommonTagsLabel, List<TagDto> selec
 
                     if (paymentTag?.UncommonTags != null)
                     {
-                        
+
                         tagList.AddRange(paymentTag.UncommonTags);
                     }
                 }
@@ -158,7 +150,7 @@ await _paymentTagsService.AssignTagsAsync(new AssignPaymentTagDto
             }
         }
 
-         
+
 
         private static T? DeserializeJson<T>(string jsonString) where T : class
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml
index 87df724af..5e8eb59e5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml
@@ -1,20 +1,23 @@
-<div class="action-bar p-2 search-action-bar">
+@using Unity.Modules.Shared
+@using Volo.Abp.Authorization.Permissions
+
+@inject IPermissionChecker PermissionChecker
+
+<div class="action-bar p-2 search-action-bar">
     <div class="search-action-bar_search-wrapper">
         <input type="search" id="search" placeholder="Search" class="tbl-search">
     </div>
 
     <div class="btn-group" id="app_custom_buttons">
-
+        @if(await PermissionChecker.IsGrantedAsync(UnitySelector.Payment.Tags.Create) || await PermissionChecker.IsGrantedAsync(UnitySelector.Payment.Tags.Delete))
+        {
         <abp-button id="tagPayment"
                     data-selector="batch-payment-table-actions"
                     text="Tags"
                     class="custom-table-btn flex-none btn btn-secondary disabled"
                     button-type="Secondary" />
-
+        }
     </div>
 
-    <div id="dynamicButtonContainerId" class="dynamic-buttons-div">
-
-       
-    </div>
+    <div id="dynamicButtonContainerId" class="dynamic-buttons-div"></div>
 </div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.cs
index 6c0f80fe0..b5d8e44fc 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.cs
@@ -62,6 +62,7 @@ public static partial class Scoresheet
             public const string Update  = "Unity.GrantManager.ApplicationManagement.Application.Scoresheet.Update";
             public const string Delete  = "Unity.GrantManager.ApplicationManagement.Application.Scoresheet.Delete";
         }
+
         public static partial class Summary
         {
             public const string Default = "Unity.GrantManager.ApplicationManagement.Application.Summary";
@@ -69,7 +70,14 @@ public static partial class Summary
             public const string Update  = "Unity.GrantManager.ApplicationManagement.Application.Summary.Update";
             public const string Delete  = "Unity.GrantManager.ApplicationManagement.Application.Summary.Delete";
         }
+
+        public static partial class Tags
+        {
+            public const string Create  = "Unity.Applications.Tags.Create";
+            public const string Delete  = "Unity.Applications.Tags.Delete";
+        }
     }
+
     public static partial class Review
     {
         public const string Default     = "Unity.GrantManager.ApplicationManagement.Review";
@@ -207,6 +215,12 @@ public static partial class PaymentList
             public const string Update  = "Unity.GrantManager.ApplicationManagement.Payment.PaymentList.Update";
             public const string Delete  = "Unity.GrantManager.ApplicationManagement.Payment.PaymentList.Delete";
         }
+
+        public static partial class Tags
+        {
+            public const string Create  = "Unity.Payments.Tags.Create";
+            public const string Delete  = "Unity.Payments.Tags.Delete";
+        }
     }
 
     public static partial class Project
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css
index ccf38d59f..3d7716128 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css
@@ -588,7 +588,8 @@ abp-date-picker .btn {
     background: transparent;
     padding: 10px;
     border-radius: 4px;
-    border: 1px solid #ccc
+    border: 1px solid #ccc;
+    min-height: 3em;
 }
 
     .tags-input-wrapper input {
@@ -608,6 +609,12 @@ abp-date-picker .btn {
         margin-bottom: 5px;
     }
 
+.tags-input-disabled {
+    background-color: var(--bc-colors-grey-hover) !important;
+    opacity: var(--bs-btn-disabled-opacity);
+    background-blend-mode: difference;
+}
+
 .tags-uncommon {
     background-color: #013366;
     color: white;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormAppService.cs
index 0550e005e..285357a88 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormAppService.cs
@@ -19,5 +19,6 @@ public interface IApplicationFormAppService : ICrudAppService<
         Task<IList<ApplicationFormVersionDto>> GetPublishedVersionsAsync(Guid id);
         Task PatchOtherConfig(Guid id, OtherConfigDto config);
         Task<decimal?> GetFormPaymentApprovalThresholdByApplicationIdAsync(Guid applicationId);
+        Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index be0069adb..6be96816b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -61,6 +61,7 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public List<ApplicationTagsDto>? ApplicationTag { get; set; }
     public Guid? OwnerId { get; set; }
     public string? OrganizationName { get; set; }
+    public string? NonRegOrgName { get; set; }
     public string? OrganizationType { get; set; }
     public GrantApplicationAssigneeDto Owner { get; set; } = new();
     public string? OrgStatus  { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/AccountCodingDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/AccountCodingDto.cs
deleted file mode 100644
index 0e277d2ff..000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/AccountCodingDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace Unity.GrantManager.Payments
-{
-    public class AccountCodingDto : AuditedEntityDto<Guid>
-{       
-        public string? MinistryClient { get; private set; } = string.Empty;
-        public string? Responsibility { get; private set; } = string.Empty;
-        public string? ServiceLine { get; private set; } = string.Empty;
-        public string? Stob { get; private set; } = string.Empty;
-        public string? ProjectNumber { get; private set; } = string.Empty;
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/IAccountCodingAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/IAccountCodingAppService.cs
index df1da44a5..1c4deb4cf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/IAccountCodingAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Payments/IAccountCodingAppService.cs
@@ -1,4 +1,5 @@
 using System;
+using Unity.Payments.PaymentRequests;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
index a08a30e17..3ae52ec85 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
@@ -80,12 +80,6 @@ public override void Define(IPermissionDefinitionContext context)
             settingManagement.AddPermission(UnitySettingManagementPermissions.BackgroundJobSettings, L("Permission:UnitySettingManagementPermissions.BackgroundJobs"));
             settingManagement.AddPermission(UnitySettingManagementPermissions.ConfigurePayments, L("Permission:UnitySettingManagementPermissions.ConfigurePayments"));
 
-            // Settings - Tag Management
-            var tagManagement = settingManagement.AddPermission(UnitySelector.SettingManagement.Tags.Default, L(UnitySelector.SettingManagement.Tags.Default));
-            tagManagement.AddChild(UnitySelector.SettingManagement.Tags.Create, L(UnitySelector.SettingManagement.Tags.Create));
-            tagManagement.AddChild(UnitySelector.SettingManagement.Tags.Update, L(UnitySelector.SettingManagement.Tags.Update));
-            tagManagement.AddChild(UnitySelector.SettingManagement.Tags.Delete, L(UnitySelector.SettingManagement.Tags.Delete));
-
             var emailingPermission = context.GetPermissionOrNull(SettingManagementPermissions.Emailing);
             if (emailingPermission != null)
             {
@@ -102,7 +96,18 @@ public override void Define(IPermissionDefinitionContext context)
             if (timezonePermission != null)
             {
                 timezonePermission.IsEnabled = false;
-            }
+            }
+
+            //-- TAG MANAGEMENT
+            var tagManagement = settingManagement.AddPermission(UnitySelector.SettingManagement.Tags.Default, L(UnitySelector.SettingManagement.Tags.Default));
+            tagManagement.AddChild(UnitySelector.SettingManagement.Tags.Create, L(UnitySelector.SettingManagement.Tags.Create));
+            tagManagement.AddChild(UnitySelector.SettingManagement.Tags.Update, L(UnitySelector.SettingManagement.Tags.Update));
+            tagManagement.AddChild(UnitySelector.SettingManagement.Tags.Delete, L(UnitySelector.SettingManagement.Tags.Delete));
+
+            //-- TAG ASSIGNMENT
+            var tagsPermissionsGroup = context.AddGroup("Tags", L("Permission:Tags"));
+            tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Create, L(UnitySelector.Application.Tags.Create));
+            tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Delete, L(UnitySelector.Application.Tags.Delete));
         }
 
         private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
index 35aed3ef1..920670030 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
@@ -46,7 +46,8 @@ public async Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intake
         } else {
             applicant.ApplicantName = MappingUtil.ResolveAndTruncateField(600, string.Empty, intakeMap.ApplicantName) ?? applicant.ApplicantName;
             applicant.ElectoralDistrict = intakeMap.ElectoralDistrict ?? applicant.ElectoralDistrict;
-            applicant.NonRegisteredBusinessName = intakeMap.NonRegisteredBusinessName ?? applicant.NonRegisteredBusinessName;
+            // Intake map uses NonRegisteredBusinessName for non-registered organizations to support legacy mappings
+            applicant.NonRegOrgName = intakeMap.NonRegisteredBusinessName ?? applicant.NonRegOrgName;
             applicant.OrgName = intakeMap.OrgName ?? applicant.OrgName;
             applicant.OrgNumber = intakeMap.OrgNumber ?? applicant.OrgNumber;
             applicant.OrganizationType = intakeMap.OrganizationType ?? applicant.OrganizationType;
@@ -283,7 +284,8 @@ private async Task<Applicant> CreateNewApplicantAsync(IntakeMapping intakeMap)
         {
             ApplicantName = MappingUtil.ResolveAndTruncateField(600, string.Empty, intakeMap.ApplicantName),
             ElectoralDistrict = intakeMap.ElectoralDistrict,
-            NonRegisteredBusinessName = intakeMap.NonRegisteredBusinessName,
+            // Intake map uses NonRegisteredBusinessName for non-registered organizations to support legacy mappings
+            NonRegOrgName = intakeMap.NonRegisteredBusinessName,
             OrgName = intakeMap.OrgName,
             OrgNumber = intakeMap.OrgNumber,
             OrganizationType = intakeMap.OrganizationType,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs
index 18897a819..afb6b1cf3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs
@@ -162,6 +162,15 @@ public async Task PatchOtherConfig(Guid id, OtherConfigDto config)
     }
 
     [Authorize(PaymentsPermissions.Payments.EditFormPaymentConfiguration)]
+    public async Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId)
+    {
+        // Get the payment threshold for the application
+        GrantApplicationDto grantApplicationDto = await _applicationService.GetAsync(applicationId);
+        Guid formId = grantApplicationDto.ApplicationForm.Id;
+        ApplicationForm appForm = await _applicationFormRepository.GetAsync(formId);     
+        return appForm.PreventPayment;
+    }
+
     public async Task SavePaymentConfiguration(FormPaymentConfigurationDto dto)
     {
         ApplicationForm appForm = await _applicationFormRepository.GetAsync(dto.ApplicationFormId);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationTagsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationTagsAppService.cs
index 504314ed6..2512b3684 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationTagsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationTagsAppService.cs
@@ -13,8 +13,6 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.EventBus.Local;
-using Volo.Abp.ObjectMapping;
-using static Unity.GrantManager.Permissions.GrantApplicationPermissions;
 
 namespace Unity.GrantManager.GrantApplications;
 
@@ -45,7 +43,7 @@ public async Task<List<ApplicationTagsDto>> GetListWithApplicationIdsAsync(List<
 
         var tags = await queryable
             .Where(x => ids.Contains(x.ApplicationId))
-            .Include(x => x.Tag) 
+            .Include(x => x.Tag)
             .ToListAsync();
 
         return ObjectMapper.Map<List<ApplicationTags>, List<ApplicationTagsDto>>(tags.OrderBy(t => t.Id).ToList());
@@ -54,7 +52,7 @@ public async Task<List<ApplicationTagsDto>> GetListWithApplicationIdsAsync(List<
     public async Task<List<ApplicationTagsDto>> GetApplicationTagsAsync(Guid id)
     {
         var tags = await (await _applicationTagsRepository
-                 .WithDetailsAsync(x => x.Tag)) 
+                 .WithDetailsAsync(x => x.Tag))
              .Where(e => e.ApplicationId == id)
              .ToListAsync();
 
@@ -66,6 +64,7 @@ public async Task<List<ApplicationTagsDto>> AssignTagsAsync(AssignApplicationTag
         var existingApplicationTags = await _applicationTagsRepository.GetListAsync(e => e.ApplicationId == input.ApplicationId);
         var existingTagIds = existingApplicationTags.Select(t => t.TagId).ToHashSet();
         var inputTagIds = input.Tags?.Select(t => t.Id).ToHashSet() ?? new HashSet<Guid>();
+
         var newTagsToAdd = input.Tags?
             .Where(tag => !existingTagIds.Contains(tag.Id))
             .Select(tag => new ApplicationTags
@@ -74,16 +73,17 @@ public async Task<List<ApplicationTagsDto>> AssignTagsAsync(AssignApplicationTag
                 TagId = tag.Id
             })
             .ToList();
-        var tagsToRemove = existingApplicationTags
-       .Where(et => !inputTagIds.Contains(et.TagId))
-       .ToList();
 
+        var tagsToRemove = existingApplicationTags
+           .Where(et => !inputTagIds.Contains(et.TagId))
+           .ToList();
 
-        if (tagsToRemove.Count > 0)
+        if (tagsToRemove.Count > 0 && await AuthorizationService.IsGrantedAsync(UnitySelector.Application.Tags.Delete))
         {
             await _applicationTagsRepository.DeleteManyAsync(tagsToRemove, autoSave: true);
         }
-        if (newTagsToAdd?.Count > 0)
+
+        if (newTagsToAdd?.Count > 0 && await AuthorizationService.IsGrantedAsync(UnitySelector.Application.Tags.Create))
         {
             await _applicationTagsRepository.InsertManyAsync(newTagsToAdd, autoSave: true);
 
@@ -98,7 +98,7 @@ public async Task<List<ApplicationTagsDto>> AssignTagsAsync(AssignApplicationTag
         }
         else
         {
-            return new List<ApplicationTagsDto>();
+            return [];
         }
     }
 
@@ -204,9 +204,9 @@ public async Task DeleteTagWithTagIdAsync(Guid id)
         var existingApplicationTags = await _applicationTagsRepository.GetListAsync(e => e.Tag.Id == id);
         var idsToDelete = existingApplicationTags.Select(x => x.Id).ToList();
         await _applicationTagsRepository.DeleteManyAsync(idsToDelete, autoSave: true);
-        
 
-      
+
+
     }
 
     [Authorize(UnitySelector.SettingManagement.Tags.Delete)]
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
index 5cefb5495..20cd5a8a1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -128,6 +128,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(PagedAndSort
             appDto.ApplicationTag = ObjectMapper.Map<List<ApplicationTags>, List<ApplicationTagsDto>>(firstApplication.ApplicationTags?.ToList() ?? new List<ApplicationTags>());
             appDto.Owner = BuildApplicationOwner(firstApplication.Owner);
             appDto.OrganizationName = firstApplication.Applicant?.OrgName ?? string.Empty;
+            appDto.NonRegOrgName = firstApplication.Applicant?.NonRegOrgName ?? string.Empty;
             appDto.OrganizationType = firstApplication.Applicant?.OrganizationType ?? string.Empty;
             appDto.Assignees = BuildApplicationAssignees(firstApplication.ApplicationAssignments);
             appDto.SubStatusDisplayValue = MapSubstatusDisplayValue(appDto.SubStatus);
@@ -246,7 +247,7 @@ public async Task<GrantApplicationDto> GetAsync(Guid id)
             appDto.OrgNumber = application.Applicant.OrgNumber;
             appDto.OrganizationSize = application.Applicant.OrganizationSize;
             appDto.OrgStatus = application.Applicant.OrgStatus;
-            appDto.OrganizationName = application.Applicant.OrgName;
+            appDto.NonRegOrgName = application.Applicant.NonRegOrgName;
             appDto.Sector = application.Applicant.Sector;
             appDto.OrganizationType = application.Applicant.OrganizationType;
             appDto.SubSector = application.Applicant.SubSector;
@@ -618,7 +619,6 @@ public async Task<GrantApplicationDto> UpdateProjectApplicantInfoAsync(Guid id,
         applicant.FiscalMonth = input.FiscalMonth ?? "";
         applicant.NonRegOrgName = input.NonRegOrgName ?? "";
         applicant.ElectoralDistrict = input.ElectoralDistrict ?? "";
-        applicant.ApplicantName = input.ApplicantName ?? "";
 
         _ = await _applicantRepository.UpdateAsync(applicant);
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
index dd89fa432..77a47ff1b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
@@ -12,9 +12,9 @@
 using Unity.GrantManager.Identity;
 using Unity.GrantManager.Intakes;
 using Unity.GrantManager.Locality;
-using Unity.GrantManager.Payments;
 using Unity.GrantManager.Zones;
 using Unity.Payments.Domain.AccountCodings;
+using Unity.Payments.PaymentRequests;
 
 namespace Unity.GrantManager;
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Payments/AccountCodingAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Payments/AccountCodingAppService.cs
index 4a0e75f0d..4bd9de87b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Payments/AccountCodingAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Payments/AccountCodingAppService.cs
@@ -1,5 +1,6 @@
 using System;
 using Unity.Payments.Domain.AccountCodings;
+using Unity.Payments.PaymentRequests;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json
index 6bc560fc9..a8763b123 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json
@@ -228,6 +228,10 @@
     "Unity.GrantManager.SettingManagement.Tags.Update": "Edit Tag",
     "Unity.GrantManager.SettingManagement.Tags.Delete": "Delete Tag",
 
+    "Permission:Tags": "Tags",
+    "Unity.Applications.Tags.Create": "Assign Tag to Applications",
+    "Unity.Applications.Tags.Delete": "Remove Tag from Applications",
+
     "GrantManager:AssessmentUserAssignmentAlreadyExists": "Business Exception: You cannot create two assessments on an application for the same user.",
     "GrantManager:CantCreateAssessmentForFinalStateApplication": "Business Exception: You cannot create an assessment for an application in final state.",
 
@@ -321,6 +325,7 @@
     "Summary:Application.SubmissionDate": "Submission Date",
     "Summary:Application.OrganizationName": "Registered Organization Name",
     "Summary:Application.OrganizationNumber": "Registered Organization Number",
+    "Summary:Application.NonRegOrgName": "Non-Registered Organization Name",
     "Summary:Application.City": "City",
     "Summary:Application.Community": "Community",
     "Summary:Application.RequestedAmount": "Requested Amount",
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Intakes/Mapping/IntakeMapping.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Intakes/Mapping/IntakeMapping.cs
index 52cadba16..9731a46ef 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Intakes/Mapping/IntakeMapping.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Intakes/Mapping/IntakeMapping.cs
@@ -141,7 +141,7 @@ public class IntakeMapping
         [Browsable(true)]
         public string? MailingUnit { get; set; }
 
-        [DisplayName("Non-Registered Business Name")]
+        [DisplayName("Non-Registered Organization Name")]
         [MapFieldType("String")]
         [Browsable(true)]
         public string? NonRegisteredBusinessName { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
index 94feaa4a5..a4e280e48 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
@@ -88,6 +88,13 @@ public PermissionGrantsDataSeeder(IPermissionDataSeeder permissionDataSeeder)
             UnitySelector.SettingManagement.Tags.Delete
         ];
 
+        public readonly List<string> Tags_CommonPermissions = [
+            UnitySelector.Application.Tags.Create,
+            UnitySelector.Application.Tags.Delete,
+            UnitySelector.Payment.Tags.Create,
+            UnitySelector.Payment.Tags.Delete,
+        ];
+
         public async Task SeedAsync(DataSeedContext context)
         {
             // Default permission grants based on role
@@ -123,7 +130,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. PaymentInfo_CommonPermissions,
                     UnitySelector.Payment.Supplier.Update,
                     .. Notifications_CommonPermissions,
-                    .. Dashboard_CommonPermissions
+                    .. Dashboard_CommonPermissions,
+                    .. Tags_CommonPermissions
             ], context.TenantId);
 
             // - Reviewer
@@ -157,7 +165,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. ProjectInfo_CommonPermissions,
                     .. PaymentInfo_CommonPermissions,
                     .. Notifications_CommonPermissions,
-                    .. Dashboard_CommonPermissions
+                    .. Dashboard_CommonPermissions,
+                    .. Tags_CommonPermissions
                 ], context.TenantId);
 
             // - TeamLead
@@ -183,6 +192,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     UnitySelector.Payment.Supplier.Update,
                     .. Notifications_CommonPermissions,
                     .. Dashboard_CommonPermissions,
+                    .. Tags_CommonPermissions,
 
                     // Role Specific Permissions
                     UnitySelector.Project.Summary.Update.UpdateFinalStateFields,
@@ -215,7 +225,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     GrantManagerPermissions.Organizations.ManageProfiles,
                     GrantManagerPermissions.Intakes.Default,
                     GrantManagerPermissions.ApplicationForms.Default,
-                    NotificationsPermissions.Settings,                                    
+
+
                     .. SettingManagement_Tags_CommonPermissions,
                     .. ReviewAndAssessment_CommonPermissions,
                     .. ApplicantInfo_CommonPermissions,
@@ -225,7 +236,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. Notifications_CommonPermissions,
                     NotificationsPermissions.Settings,
                     .. Dashboard_CommonPermissions,
-                    UnitySettingManagementPermissions.ConfigurePayments,    
+                    .. Tags_CommonPermissions,
+                    UnitySettingManagementPermissions.ConfigurePayments,
                     UnitySettingManagementPermissions.BackgroundJobSettings,
                 ], context.TenantId);
 
@@ -310,7 +322,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     UnitySelector.Payment.Supplier.Default,
                     UnitySelector.Payment.PaymentList.Default,
 
-                    NotificationsPermissions.Email.Default,
+                    NotificationsPermissions.Email.Default
                 ], context.TenantId);
 
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20250730153058_AB29460_ApplicantInfo_Datafix.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20250730153058_AB29460_ApplicantInfo_Datafix.Designer.cs
new file mode 100644
index 000000000..468e0a5ee
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20250730153058_AB29460_ApplicantInfo_Datafix.Designer.cs
@@ -0,0 +1,4220 @@
+// <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("20250730153058_AB29460_ApplicantInfo_Datafix")]
+    partial class AB29460_ApplicantInfo_Datafix
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .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>("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>("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<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>("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<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    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>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    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.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("OidcSubUser");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Acquisition")
+                        .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?>("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.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    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.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<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSumbissionId")
+                        .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<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<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<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>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("RenderFormIoToHtml")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    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>("RenderedHTML")
+                        .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<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("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>("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.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    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.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>("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.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<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<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (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.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.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<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>("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>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    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.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>("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.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>("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("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.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    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<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<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.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.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("OidcSubUser")
+                        .HasPrincipalKey("OidcSub");
+
+                    b.Navigation("Application");
+                });
+
+            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();
+                });
+
+            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()
+                        .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.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.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.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .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.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    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("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/20250730153058_AB29460_ApplicantInfo_Datafix.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20250730153058_AB29460_ApplicantInfo_Datafix.cs
new file mode 100644
index 000000000..df28fd79f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20250730153058_AB29460_ApplicantInfo_Datafix.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AB29460_ApplicantInfo_Datafix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+                UPDATE public.""Applicants"" AS app
+                SET ""ApplicantName"" = LEFT(sub.""MappedApplicantName"", 600)
+                FROM (
+                    SELECT
+                        afs.""ApplicantId"",
+                        afs.""Submission""->'submission'->'submission'->'data'->>
+                            (afv.""SubmissionHeaderMapping""::json->>'ApplicantName') AS ""MappedApplicantName""
+                    FROM
+                        public.""ApplicationFormVersion"" AS afv
+                    JOIN
+                        public.""ApplicationFormSubmissions"" AS afs
+                        ON afv.""Id"" = afs.""ApplicationFormVersionId""
+                ) AS sub
+                WHERE
+                    app.""Id"" = sub.""ApplicantId""
+                    AND (
+                        app.""ApplicantName"" IS NULL
+                        OR TRIM(app.""ApplicantName"") = ''
+                    )
+                    AND sub.""MappedApplicantName"" IS NOT NULL
+                    AND TRIM(sub.""MappedApplicantName"") <> '';
+            ");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTags.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTags.js
index 742bf71a3..1f6632be2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTags.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTags.js
@@ -2,12 +2,11 @@ $(function () {
 
     let suggestionsArray = [];
 
-    
     let TagsInput = function (opts) {
         this.options = Object.assign(TagsInput.defaults, opts);
         this.init();
     }
-    
+
     TagsInput.prototype.init = function (opts) {
         this.options = opts ? Object.assign(this.options, opts) : this.options;
 
@@ -24,24 +23,28 @@ $(function () {
 
         this.wrapper = document.createElement('div');
         this.input = document.createElement('input');
+        this.input.id = "tags-input-control";
         init(this);
         initEvents(this);
 
+        // Disable the input if user doesn't have create permission
+        if (!abp.auth.isGranted('Unity.Applications.Tags.Create')) {
+            this.input.disabled = true;
+            this.input.type = "hidden";
+            this.wrapper.classList.add('tags-input-disabled');
+        }
+
         this.initialized = true;
         return this;
     }
 
-
-    
     TagsInput.prototype.addTag = function (tagData) {
         let defaultClass = 'tags-common';
-        let id,tagText, tagClass;
-
-            id = tagData.id;
-            tagText = tagData.name || '';
-            tagClass = tagData.class || defaultClass;
+        let id, tagText, tagClass;
 
-        
+        id = tagData.id;
+        tagText = tagData.name || '';
+        tagClass = tagData.class || defaultClass;
 
         if (this.anyErrors(tagText))
             return;
@@ -54,38 +57,40 @@ $(function () {
         tag.className = this.options.tagClass + ' ' + tagClass;
         tag.innerText = tagText;
 
-        let closeIcon = document.createElement('a');
-        closeIcon.innerHTML = '&times;';
+        if (abp.auth.isGranted('Unity.Applications.Tags.Delete')) {
+            let closeIcon = document.createElement('a');
+            closeIcon.innerHTML = '&times;';
 
-        
-        closeIcon.addEventListener('click', function (e) {
-            e.preventDefault();
-            let tag = this.parentNode;
+            closeIcon.addEventListener('click', function (e) {
+                e.preventDefault();
+                let tag = this.parentNode;
 
-            for (let i = 0; i < tagInput.wrapper.childNodes.length; i++) {
-                if (tagInput.wrapper.childNodes[i] == tag)
-                    tagInput.deleteTag(tag, i);
-            }
-        })
+                let tagIndex = Array.from(tagInput.wrapper.childNodes).indexOf(tag);
+                if (tagIndex !== -1) {
+                    tagInput.deleteTag(tag, tagIndex);
+                }
+            })
+
+            tag.appendChild(closeIcon);
+        }
 
-        tag.appendChild(closeIcon);
         this.wrapper.insertBefore(tag, this.input);
         this.orignal_input.value = JSON.stringify(this.arr);
         updateSelectedTagsInput(this.arr)
         return this;
     }
 
-    
     TagsInput.prototype.deleteTag = function (tag, i) {
         let self = this;
 
-        if (this.arr[i].name === 'Uncommon Tags') {
+        if (this.arr[i] && this.arr[i].name === 'Uncommon Tags') {
             abp.message.confirm('Are you sure you want to delete all the uncommon tags?')
                 .then(function (confirmed) {
                     if (confirmed) {
                         tag.remove();
                         self.arr.splice(i, 1);
                         self.orignal_input.value = JSON.stringify(self.arr);
+                        updateSelectedTagsInput(self.arr);
                         return self;
                     }
                 });
@@ -93,11 +98,11 @@ $(function () {
             tag.remove();
             this.arr.splice(i, 1);
             this.orignal_input.value = JSON.stringify(this.arr);
+            updateSelectedTagsInput(this.arr);
             return this;
         }
     }
 
-    
     TagsInput.prototype.anyErrors = function (string) {
         if (this.options.max != null && this.arr.length >= this.options.max) {
             console.log('max tags limit reached');
@@ -115,7 +120,6 @@ $(function () {
         return false;
     }
 
-    
     TagsInput.prototype.addData = function (array) {
         let plugin = this;
 
@@ -125,16 +129,14 @@ $(function () {
         return this;
     }
 
-    
     TagsInput.prototype.getInputString = function () {
         return this.arr.join(',');
     }
+
     TagsInput.prototype.setSuggestions = function (sugArray) {
         suggestionsArray = sugArray;
     }
 
-
-    
     TagsInput.prototype.destroy = function () {
         this.orignal_input.removeAttribute('hidden');
 
@@ -152,7 +154,6 @@ $(function () {
         this.initialized = false;
     }
 
-    
     function init(tags) {
         tags.wrapper.append(tags.input);
         tags.wrapper.classList.add(tags.options.wrapperClass);
@@ -161,45 +162,35 @@ $(function () {
         tags.input.addEventListener('input', function () {
             const inputValue = tags.input.value.trim().toLowerCase();
 
-            
             if (inputValue.length > 1) {
                 const suggestions = suggestionsArray.filter(tag =>
                     (tag.name.toLowerCase()).includes(inputValue));
 
-                
                 if (suggestions.length) {
                     displaySuggestions(tags, suggestions);
                 } else {
                     removeSuggestions(tags);
                 }
-
             } else {
-                
                 removeSuggestions(tags);
             }
         });
     }
 
-    
     function displaySuggestions(tags, suggestions) {
-        
+
         removeSuggestions(tags);
 
-        
         const suggestionContainer = document.createElement('div');
         suggestionContainer.classList.add('tags-suggestion-container');
         const suggestionTitleElement = document.createElement('div');
         suggestionTitleElement.className = 'tags-suggestion-title';
         suggestionTitleElement.innerText = 'ALL TAGS';
         suggestionContainer.appendChild(suggestionTitleElement);
-
-        
         suggestions.forEach(suggestion => {
             const suggestionElement = document.createElement('div');
             suggestionElement.className = 'tags-suggestion-element';
             suggestionElement.innerText = typeof suggestion === 'string' ? suggestion : suggestion.name;
-
-            
             suggestionElement.addEventListener('click', function () {
                 tags.addTag(suggestion);
                 removeSuggestions(tags);
@@ -209,11 +200,9 @@ $(function () {
             suggestionContainer.appendChild(suggestionElement);
         });
 
-        
         tags.wrapper.appendChild(suggestionContainer);
     }
 
-    
     function removeSuggestions(tags) {
         const suggestionContainer = tags.wrapper.querySelector('.tags-suggestion-container');
         if (suggestionContainer) {
@@ -221,33 +210,27 @@ $(function () {
         }
     }
 
-    
     function initEvents(tags) {
         tags.wrapper.addEventListener('click', function () {
             tags.input.focus();
         });
 
-        
         tags.input.addEventListener('focusout', function () {
             $('#assignTagsModelSaveBtn').click(function () {
                 trimAndAddTag(tags);
             })
         });
 
-
         tags.input.addEventListener('keydown', function (e) {
-
             if (~[9, 13, 188, 32].indexOf(e.keyCode)) {
                 e.preventDefault();
                 trimAndAddTag(tags);
                 removeSuggestions(tags);
 
             }
-
         });
     }
 
-    
     function trimAndAddTag(tags) {
         let str = tags.input.value.trim();
         if (!str) {
@@ -255,10 +238,8 @@ $(function () {
             return;
         }
 
-        
         const matched = suggestionsArray.find(s =>
-       
-                 s.name.toLowerCase() === str.toLowerCase()
+            s.name.toLowerCase() === str.toLowerCase()
         );
 
         if (matched) {
@@ -271,17 +252,14 @@ $(function () {
     }
 
     function updateSelectedTagsInput(tagsArray) {
-        
         let jsonValue = JSON.stringify(tagsArray);
         $('#SelectedTagsJson').val(jsonValue);
-       
     }
 
     TagsInput.prototype.getTags = function () {
-        return this.arr.slice(); 
+        return this.arr.slice();
     }
 
-    
     TagsInput.defaults = {
         selector: '',
         wrapperClass: 'tags-input-wrapper',
@@ -291,5 +269,4 @@ $(function () {
     }
 
     window.TagsInput = TagsInput;
-
 });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml
index 501cf5ff9..cda2a779a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml
@@ -1,10 +1,16 @@
 @page
-@model Unity.GrantManager.Web.Pages.ApplicationTags.ApplicationTagsModalModel
+@using Newtonsoft.Json
+@using Unity.Modules.Shared
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Volo.Abp.Authorization.Permissions
+
+@model Unity.GrantManager.Web.Pages.ApplicationTags.ApplicationTagsModalModel
+
 @{
     Layout = null;
 }
-@using Newtonsoft.Json
+
+@inject IPermissionChecker PermissionChecker
 
 <form method="post" asp-page-handler="OnPostAsync" data-check-form-on-close="false" id="applicationTagForm">
 
@@ -13,6 +19,16 @@
     <abp-modal-body>
         <div>
                 <input type="text" id="SelectedTags" asp-for="@Model.SelectedTags" />
+                @if (!await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Tags.Create))
+                {
+                    <div class="form-text"><strong>Note: </strong>The current user does not have permission to assign application tags.</div>
+                }
+
+                @if (!await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Tags.Delete))
+                {
+                    <div class="form-text"><strong>Note: </strong>The current user does not have permission to remove application tags.</div>
+                }
+
                 <input type="hidden" id="SelectedTagsJson" name="SelectedTagsJson" />
                 <abp-input type="hidden" id="SelectedApplicationIds" asp-for="@Model.SelectedApplicationIds" />
                 <abp-input type="hidden" id="ActionType" asp-for="@Model.ActionType" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml.cs
index 96a14a971..b0a8c405f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml.cs
@@ -38,7 +38,6 @@ public class ApplicationTagsModalModel : AbpPageModel
         public string? ActionType { get; set; } = string.Empty;
 
         private readonly IApplicationTagsService _applicationTagsService;
-        private readonly ITagsService _tagsService;
 
         [BindProperty]
         [DisplayName("Common Tags")]
@@ -53,15 +52,14 @@ public class ApplicationTagsModalModel : AbpPageModel
         public List<NewTagItem> Tags { get; set; } = new();
 
         [BindProperty]
-        public string? SelectedTagsJson { get; set; } 
+        public string? SelectedTagsJson { get; set; }
 
         [BindProperty]
         public string? TagsJson { get; set; }
 
-        public ApplicationTagsModalModel(IApplicationTagsService applicationTagsService, ITagsService tagsService)
+        public ApplicationTagsModalModel(IApplicationTagsService applicationTagsService)
         {
             _applicationTagsService = applicationTagsService ?? throw new ArgumentNullException(nameof(applicationTagsService));
-            _tagsService = tagsService ?? throw new ArgumentNullException(nameof(tagsService));
         }
 
         public Task OnGetAsync(string applicationIds, string actionType)
@@ -84,9 +82,9 @@ public async Task<IActionResult> OnPostAsync()
                 if (SelectedTags != null && applicationIds != null && applicationIds.Count > 0)
                 {
                     var selectedTagList = DeserializeJson<List<TagDto>>(SelectedTags) ?? [];
-                    var tagItems = string.IsNullOrWhiteSpace(TagsJson)? null : DeserializeJson<List<NewTagItem>>(TagsJson);
+                    var tagItems = string.IsNullOrWhiteSpace(TagsJson) ? null : DeserializeJson<List<NewTagItem>>(TagsJson);
                     await ProcessTagsAsync(uncommonTags, selectedTagList, applicationIds.ToArray(), tagItems);
-                 
+
                 }
             }
             catch (Exception ex)
@@ -127,7 +125,6 @@ private async Task ProcessTagsAsync(string uncommonTagsLabel, List<TagDto> selec
 
                 try
                 {
-
                     await _applicationTagsService.AssignTagsAsync(new AssignApplicationTagsDto
                     {
                         ApplicationId = item,
@@ -137,12 +134,9 @@ await _applicationTagsService.AssignTagsAsync(new AssignApplicationTagsDto
                 catch (Exception ex)
                 {
                     Console.WriteLine($"Error processing ApplicationId {item}: {ex.Message}");
-                   
+
                 }
             }
-
-
-
         }
         private static T? DeserializeJson<T>(string jsonString) where T : class
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.css
index d2aa2837b..ed6ddb589 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.css
@@ -124,4 +124,9 @@ table.dataTable tbody tr {
     border-radius:inherit;
 }
 
+.dt-button-collection.shift-left {
+    left: unset !important; 
+    right: 0px !important;
+}
+
 /**end**/
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
index 106a4e508..49a710276 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
@@ -268,7 +268,8 @@
             getFyeDayColumn(columnIndex++),
             getFyeMonthColumn(columnIndex++),
             getApplicantIdColumn(columnIndex++),
-            getPayoutColumn(columnIndex++)
+            getPayoutColumn(columnIndex++),
+            getNonRegisteredOrganizationNameColumn(columnIndex++),
         ].map((column) => ({ ...column, targets: [column.index], orderData: [column.index, 0] }))
             .sort((a, b) => a.index - b.index);
         return sortedColumns;
@@ -863,6 +864,19 @@
             index: columnIndex
         }
     }
+
+    function getNonRegisteredOrganizationNameColumn(columnIndex) {
+        return {
+            title: l('Summary:Application.NonRegOrgName'),
+            name: 'nonRegOrgName',
+            data: 'nonRegOrgName',
+            className: 'data-table-header',
+            render: function (data) {
+                return data ?? '';
+            },
+            index: columnIndex
+        }
+    }
     function getDueDiligenceStatusColumn(columnIndex) {
         return {
             title: 'Due Diligence Status',
@@ -1244,6 +1258,25 @@
             dataTable.rows({ 'page': 'current' }).deselect();
         }
     });
+
+
+    /* Fix when selecting option 'Other Sector/Sub/Industry Description' in the dropdown column list */
+    $(document).on('click', '.dt-button-collection .buttons-columnVisibilitynull span', function () {
+        if ($(this).text().trim() === 'Other Sector/Sub/Industry Description') {
+            // Add a custom class to the open dropdown
+            $('.dt-button-collection').addClass('shift-left');
+        } else {
+            // Optionally remove the class if another button is clicked
+            $('.dt-button-collection').removeClass('shift-left');
+        }
+    });
+
+    $(document).on('click', function (e) {
+        if (!$(e.target).closest('.dt-button-collection').length) {
+            $('.dt-button-collection').removeClass('shift-left');
+        }
+    });
+
 });
 function payoutDefinition(approvedAmount, totalPaid) {
     if ((approvedAmount > 0 && totalPaid > 0) && (approvedAmount  === totalPaid)) {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
index e34a33c80..187c23567 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
@@ -3,8 +3,9 @@
 @using Microsoft.Extensions.Localization;
 @using Unity.GrantManager.Permissions;
 @using Unity.GrantManager.Payments;
-@using Unity.Payments.Permissions
-@using Volo.Abp.Authorization.Permissions
+@using Unity.Modules.Shared;
+@using Unity.Payments.Permissions;
+@using Volo.Abp.Authorization.Permissions;
 @using Volo.Abp.Features;
 
 @inject IStringLocalizer<GrantManagerResource> L
@@ -20,40 +21,43 @@
     <div class="btn-group" id="app_custom_buttons">
 
         <abp-button id="externalLink"
-        text="@L["ApplicationList:OpenButton"].Value"
-        data-selector="applications-table-actions"
-        class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
-        button-type="Secondary" />
+            text="@L["ApplicationList:OpenButton"].Value"
+            data-selector="applications-table-actions"
+            class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+            button-type="Secondary" />
 
         <abp-button id="assignApplication"
-        data-selector="applications-table-actions"
-        button-type="Secondary"
-        class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
-        text="@L["ApplicationList:AssignButton"].Value" />
+            data-selector="applications-table-actions"
+            button-type="Secondary"
+            class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+            text="@L["ApplicationList:AssignButton"].Value" />
 
         @if (await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.Approvals.BulkApplicationApproval))
         { 
         <abp-button id="approveApplications"
-        data-selector="applications-table-actions"
-        button-type="Secondary"
-        class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
-        text="@L["ApplicationList:ApproveButton"].Value" />
+            data-selector="applications-table-actions"
+            button-type="Secondary"
+            class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+            text="@L["ApplicationList:ApproveButton"].Value" />
         }
 
+        @if(await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Tags.Create) || await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Tags.Delete))
+        {
         <abp-button id="tagApplication"
-        data-selector="applications-table-actions"
-        text="@L["ApplicationList:TagButton"].Value"
-        class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
-        button-type="Secondary" />
+            data-selector="applications-table-actions"
+            text="@L["ApplicationList:TagButton"].Value"
+            class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+            button-type="Secondary" />
+        }
 
         @if (await FeatureChecker.IsEnabledAsync(PaymentConsts.UnityPaymentsFeature)
             && await PermissionChecker.IsGrantedAsync(PaymentsPermissions.Payments.RequestPayment))
         {
-            <abp-button id="applicationPaymentRequest"
-                        data-selector="applications-table-actions"
-                        text="Payment"
-                        class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
-                        button-type="Secondary" />
+        <abp-button id="applicationPaymentRequest"
+                    data-selector="applications-table-actions"
+                    text="Payment"
+                    class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+                    button-type="Secondary" />
 
         }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
index d61d2ac77..04f967339 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
@@ -647,7 +647,6 @@
                         </table>
                     </div>
                     <div class="text-center">
-                        <span class="fw-bold">Note:</span> If a different principal is selected, the existing contact information and address will be passed over to the chosen principal.
                     </div>
                     <div class="d-flex justify-content-end m-3">
                         <button type="button" class="btn btn-primary" id="mergeApplicantsNextBtn">Next</button>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
index 9d82c4834..525bb92e8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
@@ -24,7 +24,7 @@
                             <option value="">Please choose...</option>
                         </abp-select>
                     </abp-column>
-                    <abp-column size-lg="_3" size-sm="_12" class="px-1">
+                    <abp-column size="_6" class="px-1">
                         <label class="form-label text-nowrap" for="PaymentApprovalThreshold">Approval Payment Threshold</label>
                         <div class="input-group flex-nowrap">
                             <span class="input-group-text">$</span>
@@ -35,24 +35,25 @@
                                     data-val-range="The field Payment Threshold Amount must be 0 or greater."
                                     data-val-range-max="1.7976931348623157E+308"
                                     data-val-range-min="0"
-                                    placeholder="0.00"
                                     id="PaymentApprovalThreshold" name="PaymentApprovalThreshold"
                                     value="@Model.PaymentApprovalThreshold" class="form-control-currency text-end rounded-end">
                         </div>
                     </abp-column>
                 </abp-row>
                 <abp-row class="m-0 mt-3 mt-lg-0">
-                    <abp-column size="_12" size-lg="_9">
+                    <abp-column size="_6">
                         <p class="alert alert-light border-0 border-4 border-start rounded-0 text-body">
                             <strong>Note:</strong> The selected Account Code for this form will only apply to payments 
                             made within this specific intake form. It will not impact the global Account Code settings.
                         </p>
+                    </abp-column>
+                    <abp-column size="_6">
                         <p class="alert alert-light border-0 border-4 border-start rounded-0 text-body">
-                            <strong>Note:</strong> Set the Approval Payment Threshold here only if this intake form requires a unique threshold. 
+                            <strong>Note:</strong> Set the Approval Payment Threshold here only if this intake form requires a unique threshold.<br/> 
                             The individual Approval Thresholds assigned to each l2_approver will still take precedence if they are lower 
-                            than the threshold specified in this form. This form's threshold will not override the l2_approver's existing thresholds.
+                            than the threshold specified in this form.
                         </p>
-                    </abp-column>
+                    </abp-column>                    
                 </abp-row>
             </abp-column>
             <hr />