diff --git a/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts b/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
index 3a73fef29b..35be3f99c9 100644
--- a/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
@@ -10,31 +10,34 @@ describe('Grant Manager Login and List Navigation', () => {
     const appsPage = ApplicationsPageInstance()
 
     function setDashboardIntakeToTestIfAvailable() {
-        const btnSel = 'button[data-id="dashboardIntakeId"]'
-        const listboxSel = '#bs-select-1[role="listbox"]'
-        const searchSel = 'input[type="search"][aria-controls="bs-select-1"]'
-
-        cy.get(btnSel, { timeout: 30000 })
+        // The INTAKES filter is a Select2 (bootstrap-5 theme) multi-select, not
+        // bootstrap-select — the toggle is the [role="combobox"] wrapping the
+        // rendered-choices <ul id="select2-dashboardIntakeId-container">.
+        const renderedSel = '#select2-dashboardIntakeId-container'
+        const dropdownSel = '.select2-dropdown'
+        const optionSel = `${dropdownSel} li.select2-results__option`
+
+        cy.get(renderedSel, { timeout: 30000 })
             .should('be.visible')
-            .first()
+            .closest('[role="combobox"]')
+            .as('intakeCombobox')
             .click({ force: true })
 
-        cy.get(listboxSel, { timeout: 30000 }).should('be.visible')
+        cy.get(dropdownSel, { timeout: 30000 }).should('be.visible')
 
-        cy.get(searchSel, { timeout: 30000 })
+        cy.get(renderedSel)
+            .parent()
+            .find('textarea.select2-search__field', { timeout: 30000 })
             .should('be.visible')
             .clear()
             .type('Test')
 
-        cy.contains(`${listboxSel} a.dropdown-item[role="option"] span.text`, /^Test$/, { timeout: 30000 })
-            .closest('a.dropdown-item')
+        cy.contains(optionSel, /^Test$/, { timeout: 30000 })
             .then(($opt) => {
-                const selected =
-                    $opt.attr('aria-selected') === 'true' ||
-                    $opt.hasClass('selected')
+                const selected = $opt.attr('aria-selected') === 'true'
 
                 if (!selected) {
-                    cy.wrap($opt).scrollIntoView().click({ force: true })
+                    cy.wrap($opt).click({ force: true })
                 }
             })
 
@@ -43,8 +46,8 @@ describe('Grant Manager Login and List Navigation', () => {
             expect(texts).to.include('Test')
         })
 
-        cy.get(btnSel).first().click({ force: true })
-        cy.get(btnSel).first().should('have.attr', 'aria-expanded', 'false')
+        cy.get('@intakeCombobox').click({ force: true })
+        cy.get('@intakeCombobox').should('have.attr', 'aria-expanded', 'false')
     }
 
     it('Verify Login', () => {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/docs/implementation-playbook.md b/applications/Unity.GrantManager/modules/Unity.AI/docs/implementation-playbook.md
index 7c11f6f702..4f6e9f1530 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/docs/implementation-playbook.md
+++ b/applications/Unity.GrantManager/modules/Unity.AI/docs/implementation-playbook.md
@@ -21,6 +21,25 @@ Use these existing operations as the canonical references:
 6. Expose a generate surface and UI only when users need one.
 7. Add focused catalog, runtime, executor, and persistence tests.
 
+## Staged form mapping
+
+`FormMapping` and `FormWorksheet` remain independent operations. The Mapping
+tab can guide an administrator through them as a staged form-configuration flow:
+
+1. Generate mapping suggestions using the form fields, core fields, assigned
+   custom fields, and current saved mapping.
+2. Persist suggestions for review; accept them individually so existing
+   non-empty mappings always win.
+3. Generate and review `FormWorksheet` suggestions, either after mapping review
+   or directly from the idle state.
+4. Publish and assign created worksheet drafts through the normal worksheet
+   configuration UI.
+5. Invoke the same `FormMapping` operation again after publication and
+   assignment.
+
+Keep mapping review state scoped to the form version. Do not auto-link unpublished
+AI worksheet drafts to a UI anchor just to make their fields visible to mapping.
+
 ## Rules
 - Keep prompt content and operation/model configuration in the database.
 - Reuse the shared generation pipeline.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/docs/operations/form-worksheet.md b/applications/Unity.GrantManager/modules/Unity.AI/docs/operations/form-worksheet.md
index ffed292894..ee9ddf6a6e 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/docs/operations/form-worksheet.md
+++ b/applications/Unity.GrantManager/modules/Unity.AI/docs/operations/form-worksheet.md
@@ -22,6 +22,7 @@ Generate a recommended worksheet definition for a form version.
 
 ## Output Shape
 - A `fields` collection containing the suggested additional worksheet fields.
+- Include all applicable additional fields in the collection; do not limit the response to one suggestion.
 - Each suggestion supplies the field key, label, and supported custom-field type.
 - The executor builds the worksheet and its `Suggested Fields` section from the validated suggestions.
 - Keep the result valid JSON and include only fields that the form needs beyond core Unity fields.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/docs/prompt-map.md b/applications/Unity.GrantManager/modules/Unity.AI/docs/prompt-map.md
index 8de9d3350c..cc212da0de 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/docs/prompt-map.md
+++ b/applications/Unity.GrantManager/modules/Unity.AI/docs/prompt-map.md
@@ -8,6 +8,12 @@
 - `FormWorksheet` - worksheet generation
 - `FormScoresheet` - scoresheet generation
 
+`FormMapping` and `FormWorksheet` are independent operations with complete
+context inputs. The Mapping tab can guide them through mapping review, worksheet
+review, publish and assignment, and another mapping run. Review suggestions are
+persisted until accepted or discarded. Initial-review suggestions preserve existing
+non-empty mappings; accepted final-review suggestions may replace conflicting mappings.
+
 ## Versions
 - Built-in prompt rows are defined and seeded by `AIPromptDataSeeder`.
 - Families may have `v0`, `v1`, and `v2` rows; a new operation only needs the versions it supports.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
index 195bedf97b..73f5943f02 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
@@ -95,7 +95,8 @@ public override void Define(IPermissionDefinitionContext context)
             "Unity.AI.ApplicationAnalysis",
             "Unity.AI.FormMapping",
             "Unity.AI.FormWorksheet",
-            "Unity.AI.FormScoresheet"));
+            "Unity.AI.FormScoresheet",
+            "Unity.AIReporting"));
     }
 
     private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormMappingResponse.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormMappingResponse.cs
index 4015265699..215f66224c 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormMappingResponse.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormMappingResponse.cs
@@ -7,6 +7,8 @@ public class FormMappingResponse
 {
     public string Mapping { get; set; } = string.Empty;
 
+    public string? FailureReason { get; set; }
+
     [JsonPropertyName("coreFieldMatches")]
     public List<FormMappingMatchResponse> CoreFieldMatches { get; set; } = [];
 
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormScoresheetResponse.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormScoresheetResponse.cs
index 3ed8321221..827762c9a9 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormScoresheetResponse.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormScoresheetResponse.cs
@@ -7,6 +7,8 @@ public class FormScoresheetResponse
 {
     public string Scoresheet { get; set; } = string.Empty;
 
+    public string? FailureReason { get; set; }
+
     [JsonPropertyName("title")]
     public string Title { get; set; } = string.Empty;
 
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/AITenantConfigurationDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/AITenantConfigurationDto.cs
index 10a0d84b3c..f1d60c7c42 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/AITenantConfigurationDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/AITenantConfigurationDto.cs
@@ -4,4 +4,5 @@ public class AITenantConfigurationDto
 {
     public bool AutomaticGenerationEnabled { get; set; }
     public bool ManualGenerationEnabled { get; set; }
+    public bool ReportingEnabled { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/UpdateAITenantConfigurationDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/UpdateAITenantConfigurationDto.cs
index bbbed5c2f0..cbe1979f56 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/UpdateAITenantConfigurationDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/UpdateAITenantConfigurationDto.cs
@@ -4,4 +4,5 @@ public class UpdateAITenantConfigurationDto
 {
     public bool AutomaticGenerationEnabled { get; set; }
     public bool ManualGenerationEnabled { get; set; }
+    public bool ReportingEnabled { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs
index 8c96b3d3bf..4bf798fd0f 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs
@@ -28,7 +28,7 @@ public class AIOperationDataSeeder(
         new(AIPromptTypes.ApplicationScoring, 8000),
         new(AIPromptTypes.FormMapping, 2000),
         new(AIPromptTypes.FormWorksheet, 4000),
-        new(AIPromptTypes.FormScoresheet, 4000)
+        new(AIPromptTypes.FormScoresheet, 8000)
     ];
 
     public async Task SeedAsync(DataSeedContext context)
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
index 90238c25b1..c94284bd3f 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
@@ -868,7 +868,8 @@ Return only valid JSON.
         }
 
         Rules:
-        - Return one field-suggestion JSON object only.
+        - Return one JSON object containing all applicable field suggestions. Review the full form schema and every unmapped CHEFS field before responding; include every additional custom field genuinely needed, not just the first match.
+        - Return an empty fields array when no additional custom fields are needed.
         - chefsFields contains the available CHEFS source fields.
         - unityCoreFields contains existing Unity core fields. Do not create a custom field when one of these already fits.
         - existingMapping contains the current saved Unity-to-CHEFS mappings. Do not duplicate those mappings with a custom field.
@@ -932,6 +933,8 @@ Return only valid JSON.
 
         Rules:
         - Return one scoresheet definition JSON object only.
+        - Title and Name must be non-empty strings; Sections must contain at least one section and every section must contain at least one field.
+        - Every field Name and Label must be non-empty, Order and Type must be non-negative integers, and Definition must be a valid JSON object encoded as a string.
         - The context contains CHEFS form fields, allowed Unity Flex question types, and a scoresheet template.
         - Fill out the scoresheet template to generate the rubric assessors use to score submitted applications.
         - Use CHEFS form fields as evidence for assessment criteria, but do not create one question per form field.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIOperationResult.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIOperationResult.cs
index 41b3989649..024a4a214a 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIOperationResult.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIOperationResult.cs
@@ -20,7 +20,8 @@ public enum AIFailureCategory
     public sealed record AIOperationResult(
         AIOperationOutcome Outcome,
         AIProviderResult Response,
-        AIFailureCategory FailureCategory = AIFailureCategory.None)
+        AIFailureCategory FailureCategory = AIFailureCategory.None,
+        string? FailureReason = null)
     {
         public string Content => Response.Content;
 
@@ -41,8 +42,8 @@ public static AIOperationResult ProviderUnavailable(AIProviderResult? response =
         public static AIOperationResult InvalidOutput(AIProviderResult? response = null) =>
             new(AIOperationOutcome.InvalidOutput, response ?? AIProviderResult.Empty, AIFailureCategory.InvalidOutput);
 
-        public AIOperationResult WithOutcome(AIOperationOutcome outcome, AIFailureCategory? failureCategory = null) =>
-            new(outcome, Response, failureCategory ?? ResolveFailureCategory(outcome));
+        public AIOperationResult WithOutcome(AIOperationOutcome outcome, AIFailureCategory? failureCategory = null, string? failureReason = null) =>
+            new(outcome, Response, failureCategory ?? ResolveFailureCategory(outcome), failureReason ?? FailureReason);
 
         private static AIFailureCategory ResolveFailureCategory(AIOperationOutcome outcome)
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIProviderPayloadValidator.cs
index 5dc14e9603..76b0c0fa03 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIProviderPayloadValidator.cs
@@ -206,7 +206,8 @@ private static AIResponseValidationResult ValidateSections(JsonElement root, str
                     return sectionNameResult;
                 }
 
-                if (!sectionNames.Add(section.GetProperty("Name").GetString()!))
+                if (!TryGetProperty(section, "Name", out var sectionName)
+                    || !sectionNames.Add(sectionName.GetString()!))
                 {
                     return AIResponseValidationResult.Invalid($"{responseName} response contains duplicate section names.");
                 }
@@ -235,7 +236,8 @@ private static AIResponseValidationResult ValidateSections(JsonElement root, str
                         return result;
                     }
 
-                    if (!fieldNames.Add(field.GetProperty("Name").GetString()!))
+                    if (!TryGetProperty(field, "Name", out var fieldName)
+                        || !fieldNames.Add(fieldName.GetString()!))
                     {
                         return AIResponseValidationResult.Invalid($"{responseName} response contains duplicate field names.");
                     }
@@ -355,6 +357,18 @@ private static bool TryGetProperty(JsonElement element, string propertyName, out
                 return true;
             }
 
+            if (element.ValueKind == JsonValueKind.Object)
+            {
+                foreach (var candidate in element.EnumerateObject())
+                {
+                    if (string.Equals(candidate.Name, propertyName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        property = candidate.Value;
+                        return true;
+                    }
+                }
+            }
+
             property = default;
             return false;
         }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/OpenAIRuntimeService.cs
index 95eebffec6..5da7549cc1 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/OpenAIRuntimeService.cs
@@ -357,9 +357,8 @@ public async Task<FormScoresheetResponse> GenerateFormScoresheetAsync(FormScores
 
                 return new FormScoresheetResponse
                 {
-                    Scoresheet = result.Outcome == AIOperationOutcome.Success
-                        ? AIResponseJson.CleanJsonResponse(result.Content)
-                        : "{}"
+                    Scoresheet = AIResponseJson.CleanJsonResponse(result.Content),
+                    FailureReason = result.FailureReason
                 };
             }
             catch (OperationCanceledException)
@@ -406,7 +405,10 @@ private async Task<FormMappingResponse> GenerateFormMappingCoreAsync(FormMapping
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
-                    return new FormMappingResponse();
+                    return new FormMappingResponse
+                    {
+                        FailureReason = result.FailureReason ?? $"Mapping generation failed with outcome {result.Outcome}."
+                    };
                 }
 
                 return new FormMappingResponse
@@ -421,7 +423,7 @@ private async Task<FormMappingResponse> GenerateFormMappingCoreAsync(FormMapping
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Mapping suggestion generation failed.");
-                return new FormMappingResponse();
+                return new FormMappingResponse { FailureReason = ex.Message };
             }
         }
 
@@ -449,7 +451,10 @@ private async Task<AIOperationResult> GenerateWithRetryAsync(
                         return lastResult;
                     }
 
-                    lastResult = lastResult.WithOutcome(AIOperationOutcome.InvalidOutput, validationResult.FailureCategory);
+                    lastResult = lastResult.WithOutcome(
+                        AIOperationOutcome.InvalidOutput,
+                        validationResult.FailureCategory,
+                        validationResult.Reason);
 
                     _logger.LogWarning(
                         "AI {OperationName} attempt {Attempt}/{MaxAttempts} returned invalid response shape ({FailureCategory}): {Reason}; will retry if attempts remain",
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs
index f7bca0af75..0873375fa7 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs
@@ -27,7 +27,9 @@ public virtual async Task<AITenantConfigurationDto> GetTenantConfigurationAsync(
             AutomaticGenerationEnabled = await _settingProvider.GetAsync<bool>(
                 AISettings.AutomaticGenerationEnabled, defaultValue: false),
             ManualGenerationEnabled = await _settingProvider.GetAsync<bool>(
-                AISettings.ManualGenerationEnabled, defaultValue: false)
+                AISettings.ManualGenerationEnabled, defaultValue: false),
+            ReportingEnabled = await _settingProvider.GetAsync<bool>(
+                AISettings.ReportingEnabled, defaultValue: false)
         };
     }
 
@@ -46,5 +48,11 @@ await _settingManager.SetAsync(
             input.ManualGenerationEnabled.ToString().ToLowerInvariant(),
             TenantSettingValueProvider.ProviderName,
             _currentTenant.Id?.ToString());
+
+        await _settingManager.SetAsync(
+            AISettings.ReportingEnabled,
+            input.ReportingEnabled.ToString().ToLowerInvariant(),
+            TenantSettingValueProvider.ProviderName,
+            _currentTenant.Id?.ToString());
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AISettingDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AISettingDefinitionProvider.cs
index 36a1914729..f7ff46d8dd 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AISettingDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AISettingDefinitionProvider.cs
@@ -29,6 +29,17 @@ public override void Define(ISettingDefinitionContext context)
                 isEncrypted: false)
             .WithProviders(TenantSettingValueProvider.ProviderName)
         );
+
+        context.Add(
+            new SettingDefinition(
+                AISettings.ReportingEnabled,
+                "false",
+                L("Setting:AI.ReportingEnabled"),
+                isVisibleToClients: false,
+                isInherited: false,
+                isEncrypted: false)
+            .WithProviders(TenantSettingValueProvider.ProviderName)
+        );
     }
 
     private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
index 88d3d02728..26fd2bba24 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
@@ -23,8 +23,21 @@
     "Permission:AI.Prompts.Delete": "Delete Prompts",
     "Menu:AIReporting": "AI Reporting",
 
+    "AISettingGroup:Title": "AI Configuration",
+    "AISettingGroup:SaveChanges": "Save Changes",
+    "AISettingGroup:DiscardChanges": "Discard Changes",
+
     "Setting:AI.AutomaticGenerationEnabled": "Automatically Generate AI Analysis",
+    "Setting:AI.AutomaticGenerationEnabled:Description": "When enabled, AI analysis runs automatically on new application intake (subject to form-level AI configuration).",
     "Setting:AI.ManualGenerationEnabled": "Manually Initiate AI Analysis",
+    "Setting:AI.ManualGenerationEnabled:Description": "When enabled, users with appropriate permissions can manually generate or regenerate AI analysis.",
+    "Setting:AI.ReportingEnabled": "AI Reporting",
+    "Setting:AI.ReportingEnabled:Description": "When enabled, users with the AI Reporting permission can access the AI Reporting dashboard.",
+
+    "LegalDisclaimer:Title": "Legal Disclaimer",
+    "LegalDisclaimer:Body": "The Platform does not provide legal, financial, or policy advice, and may not be relied on to determine program eligibility or make final decisions in place of the user, who will be solely responsible for the use of the Platform, including the review and validation of Unity AI outputs before use.",
+    "LegalDisclaimer:Confirm": "I Understand and Agree",
+    "LegalDisclaimer:Confirming": "Confirming...",
 
     "AI:AttachmentSummariesDisabled": "AI attachment summaries are not enabled.",
     "AI:ApplicationAnalysisDisabled": "AI application analysis is not enabled.",
@@ -42,6 +55,45 @@
     "AI:ScoringRequiresScoresheetFields": "AI scoring requires a scoresheet with scoring fields.",
     "AI:AttachmentNotFound": "Attachment not found.",
     "AI:SelectAttachmentForSummaries": "Select at least one attachment to generate summaries.",
+    "AI:FormWorksheetDeleteProtected": "This AI worksheet cannot be deleted because it is published, linked to another form, or has existing instances.",
+    "AI:FormWorksheetUnavailable": "The AI worksheet is no longer available for review.",
+    "AI:FormWorksheetSelectionInvalid": "The AI worksheet selection is invalid.",
+    "AI:FormScoresheetDeleteProtected": "This AI scoresheet cannot be deleted because it is published or archived.",
+    "AI:FormScoresheetHasInstances": "This AI scoresheet cannot be deleted because it has existing instances.",
+    "AI:FormScoresheetUnavailable": "The AI scoresheet is no longer available for review.",
+    "AI:FormScoresheetTitleRequired": "A scoresheet title is required.",
+    "AI:FormScoresheetSelectionRequired": "Select at least one suggested question.",
+    "AI:FormScoresheetSelectionInvalid": "The AI scoresheet selection is invalid.",
+    "AI:GenerateFormScoresheetPermissionRequired": "You do not have permission to generate scoresheets.",
+    "AI:SavedMappingApplyFailed": "Unable to apply the saved mapping.",
+    "AI:FormGenerationReviewActive": "Review or discard the current AI suggestions before generating again.",
+    "AI:MappingReviewPending": "No mapping review is pending.",
+    "AI:MappingReviewInactive": "The mapping review is no longer active.",
+    "AI:MappingSelectionRequired": "Select at least one mapping suggestion.",
+    "AI:MappingSelectionInvalid": "One or more mapping suggestions are no longer available.",
+    "AI:MappingReviewTransitionInvalid": "That AI mapping workflow transition is not valid.",
+    "AI:MappingReviewPendingSuggestions": "Review or discard the pending mapping suggestions first.",
+    "AI:WorksheetDraftsMustBePublished": "Publish and assign the AI worksheet drafts before generating mapping.",
+    "AI:WorksheetTitleRequired": "A worksheet title is required.",
+    "AI:WorksheetSelectionRequired": "Select at least one suggested field.",
+    "AI:WorkflowGenerateInitialMapping": "Generate Initial Mapping",
+    "AI:WorkflowReviewInitialMapping": "Review Initial Mapping",
+    "AI:WorkflowGenerateWorksheets": "Generate Worksheets",
+    "AI:WorkflowReviewWorksheets": "Review Worksheets",
+    "AI:WorkflowPublishAssignWorksheets": "Publish & Assign Worksheets",
+    "AI:WorkflowGenerateFinalMapping": "Generate Final Mapping",
+    "AI:WorkflowReviewFinalMapping": "Review Final Mapping",
+    "AI:WorkflowGenerateMapping": "Generate Mapping",
+    "AI:WorkflowCompleted": "Completed",
+    "AI:ScoresheetGenerationRequiresFormVersion": "Form scoresheet generation requires an application form version.",
+    "AI:ScoresheetGenerationProtected": "The canonical AI scoresheet is published, archived, or has instances and cannot be regenerated.",
+    "AI:ScoresheetGenerationInvalidOutput": "Scoresheet generation returned invalid output: {0}",
+    "AI:ScoresheetGenerationEmpty": "Scoresheet generation returned empty content.",
+    "AI:ScoresheetGenerationUnusable": "Scoresheet generation returned an unusable scoresheet definition.",
+    "AI:ScoresheetGenerationNoVersion": "Scoresheet generation returned a definition without a valid Version.",
+    "AI:ScoresheetGenerationNoSections": "Scoresheet generation returned a definition without Sections.",
+    "AI:ScoresheetGenerationSectionNoFields": "Scoresheet generation returned section {0} without Fields.",
+    "AI:ScoresheetGenerationPropertyInvalid": "Scoresheet generation returned a {0} without a valid {1}.",
 
     "AIPrompts": "AI Prompts",
     "AIPrompt": "AI Prompt",
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs
index 3af858cf44..925ec5dc3e 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs
@@ -18,4 +18,43 @@ public static class AILocalizationKeys
     public const string ScoringRequiresScoresheetFields = "AI:ScoringRequiresScoresheetFields";
     public const string AttachmentNotFound = "AI:AttachmentNotFound";
     public const string SelectAttachmentForSummaries = "AI:SelectAttachmentForSummaries";
+    public const string FormWorksheetUnavailable = "AI:FormWorksheetUnavailable";
+    public const string FormWorksheetDeleteProtected = "AI:FormWorksheetDeleteProtected";
+    public const string FormWorksheetSelectionInvalid = "AI:FormWorksheetSelectionInvalid";
+    public const string FormScoresheetDeleteProtected = "AI:FormScoresheetDeleteProtected";
+    public const string FormScoresheetHasInstances = "AI:FormScoresheetHasInstances";
+    public const string FormScoresheetUnavailable = "AI:FormScoresheetUnavailable";
+    public const string FormScoresheetTitleRequired = "AI:FormScoresheetTitleRequired";
+    public const string FormScoresheetSelectionRequired = "AI:FormScoresheetSelectionRequired";
+    public const string FormScoresheetSelectionInvalid = "AI:FormScoresheetSelectionInvalid";
+    public const string GenerateFormScoresheetPermissionRequired = "AI:GenerateFormScoresheetPermissionRequired";
+    public const string SavedMappingApplyFailed = "AI:SavedMappingApplyFailed";
+    public const string FormGenerationReviewActive = "AI:FormGenerationReviewActive";
+    public const string MappingReviewPending = "AI:MappingReviewPending";
+    public const string MappingReviewInactive = "AI:MappingReviewInactive";
+    public const string MappingSelectionRequired = "AI:MappingSelectionRequired";
+    public const string MappingSelectionInvalid = "AI:MappingSelectionInvalid";
+    public const string MappingReviewTransitionInvalid = "AI:MappingReviewTransitionInvalid";
+    public const string MappingReviewPendingSuggestions = "AI:MappingReviewPendingSuggestions";
+    public const string WorksheetDraftsMustBePublished = "AI:WorksheetDraftsMustBePublished";
+    public const string WorksheetTitleRequired = "AI:WorksheetTitleRequired";
+    public const string WorksheetSelectionRequired = "AI:WorksheetSelectionRequired";
+    public const string WorkflowGenerateInitialMapping = "AI:WorkflowGenerateInitialMapping";
+    public const string WorkflowReviewInitialMapping = "AI:WorkflowReviewInitialMapping";
+    public const string WorkflowGenerateWorksheets = "AI:WorkflowGenerateWorksheets";
+    public const string WorkflowReviewWorksheets = "AI:WorkflowReviewWorksheets";
+    public const string WorkflowPublishAssignWorksheets = "AI:WorkflowPublishAssignWorksheets";
+    public const string WorkflowGenerateFinalMapping = "AI:WorkflowGenerateFinalMapping";
+    public const string WorkflowReviewFinalMapping = "AI:WorkflowReviewFinalMapping";
+    public const string WorkflowGenerateMapping = "AI:WorkflowGenerateMapping";
+    public const string WorkflowCompleted = "AI:WorkflowCompleted";
+    public const string ScoresheetGenerationRequiresFormVersion = "AI:ScoresheetGenerationRequiresFormVersion";
+    public const string ScoresheetGenerationProtected = "AI:ScoresheetGenerationProtected";
+    public const string ScoresheetGenerationInvalidOutput = "AI:ScoresheetGenerationInvalidOutput";
+    public const string ScoresheetGenerationEmpty = "AI:ScoresheetGenerationEmpty";
+    public const string ScoresheetGenerationUnusable = "AI:ScoresheetGenerationUnusable";
+    public const string ScoresheetGenerationNoVersion = "AI:ScoresheetGenerationNoVersion";
+    public const string ScoresheetGenerationNoSections = "AI:ScoresheetGenerationNoSections";
+    public const string ScoresheetGenerationSectionNoFields = "AI:ScoresheetGenerationSectionNoFields";
+    public const string ScoresheetGenerationPropertyInvalid = "AI:ScoresheetGenerationPropertyInvalid";
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Settings/AISettings.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Settings/AISettings.cs
index d589a02c80..e7fdf2e0da 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Settings/AISettings.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Settings/AISettings.cs
@@ -4,4 +4,5 @@ public static class AISettings
 {
     public const string AutomaticGenerationEnabled = "GrantManager.AI.AutomaticGenerationEnabled";
     public const string ManualGenerationEnabled    = "GrantManager.AI.ManualGenerationEnabled";
+    public const string ReportingEnabled           = "GrantManager.AI.ReportingEnabled";
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
index deba87c054..8da7b54593 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
@@ -2,11 +2,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using Unity.AI.Localization;
 using Unity.AI.Permissions;
+using Unity.AI.Settings;
 using Unity.Modules.Shared.Navigation;
 using Unity.Modules.Shared.Specializations;
 using Unity.Modules.Shared.Permissions;
 using Volo.Abp.Features;
+using Volo.Abp.Settings;
 using Volo.Abp.UI.Navigation;
+using Volo.Abp.Users;
 
 namespace Unity.AI.Web.Menus;
 
@@ -24,6 +27,7 @@ private static async Task ConfigureMainMenuAsync(MenuConfigurationContext contex
     {
         var l = context.GetLocalizer<AIResource>();
         var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
+        var settingProvider = context.ServiceProvider.GetRequiredService<ISettingProvider>();
 
         var specializationChecker = context.ServiceProvider.GetRequiredService<ISpecializationChecker>();
         if (!await specializationChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
@@ -37,7 +41,13 @@ await context.AddItemAsync(new ApplicationMenuItem(
             ).OnlyWhenInRole(IdentityConsts.ITOperationsRoleName));
         }
 
-        if (await featureChecker.IsEnabledAsync("Unity.AIReporting"))
+        var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
+        var isItAdmin = currentUser.IsInRole(IdentityConsts.ITAdminRoleName);
+
+        var reportingEnabled = await featureChecker.IsEnabledAsync("Unity.AIReporting")
+            && await settingProvider.GetAsync<bool>(AISettings.ReportingEnabled, defaultValue: false);
+
+        if (reportingEnabled || isItAdmin)
         {
             context.Menu.AddItem(new ApplicationMenuItem(
                 name: AIMenus.Reporting,
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/AIReporting/Index.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/AIReporting/Index.cshtml.cs
index 6d8259c9f6..3815419584 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/AIReporting/Index.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/AIReporting/Index.cshtml.cs
@@ -2,16 +2,19 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
+using Unity.AI.Settings;
 using Unity.GrantManager.Integrations;
 using Unity.Modules.Shared.Permissions;
 using Volo.Abp;
 using Volo.Abp.Features;
+using Volo.Abp.Settings;
 
 namespace Unity.AI.Web.Pages.AIReporting
 {
     public class IndexModel(
         IEndpointManagementAppService endpointManagementAppService,
         IFeatureChecker featureChecker,
+        ISettingProvider settingProvider,
         IAuthorizationService authorizationService,
         ILogger<IndexModel> logger) : PageModel
     {
@@ -20,8 +23,11 @@ public class IndexModel(
 
         public async Task OnGetAsync()
         {
-            CanViewAiReporting = await featureChecker.IsEnabledAsync("Unity.AIReporting")
-                || (await authorizationService.AuthorizeAsync(User, IdentityConsts.ITAdminPolicyName)).Succeeded;
+            var isItAdmin = (await authorizationService.AuthorizeAsync(User, IdentityConsts.ITAdminPolicyName)).Succeeded;
+            var featureAndSettingEnabled = await featureChecker.IsEnabledAsync("Unity.AIReporting")
+                && await settingProvider.GetAsync<bool>(AISettings.ReportingEnabled, defaultValue: false);
+
+            CanViewAiReporting = featureAndSettingEnabled || isItAdmin;
 
             if (!CanViewAiReporting)
             {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Settings/LegalDisclaimerModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Settings/LegalDisclaimerModal.cshtml
new file mode 100644
index 0000000000..9c31c63ff6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Settings/LegalDisclaimerModal.cshtml
@@ -0,0 +1,22 @@
+@page
+@using Unity.AI.Localization
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model Unity.AI.Web.Pages.Settings.LegalDisclaimerModalModel
+@inject IStringLocalizer<AIResource> L
+@{
+    Layout = null;
+}
+
+<form method="post" asp-page="/Settings/LegalDisclaimerModal">
+    <abp-modal>
+        <abp-modal-header title="@L["LegalDisclaimer:Title"].Value"></abp-modal-header>
+        <abp-modal-body>
+            @L["LegalDisclaimer:Body"].Value
+        </abp-modal-body>
+        <abp-modal-footer>
+            <button class="btn btn-primary" data-busy-text="@L["LegalDisclaimer:Confirming"].Value" type="submit">@L["LegalDisclaimer:Confirm"].Value</button>
+            <button class="btn btn-secondary" data-bs-dismiss="modal" type="button">@AbpModalButtons.Cancel</button>
+        </abp-modal-footer>
+    </abp-modal>
+</form>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Settings/LegalDisclaimerModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Settings/LegalDisclaimerModal.cshtml.cs
new file mode 100644
index 0000000000..5c4b9dfa2e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Settings/LegalDisclaimerModal.cshtml.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Settings;
+
+public class LegalDisclaimerModalModel : AbpPageModel
+{
+    public IActionResult OnPost()
+    {
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewComponent.cs
index 9400f61c24..efa1854d6f 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewComponent.cs
@@ -21,7 +21,9 @@ public virtual async Task<IViewComponentResult> InvokeAsync()
             AutomaticGenerationEnabled = await settingProvider.GetAsync<bool>(
                 AISettings.AutomaticGenerationEnabled, defaultValue: false),
             ManualGenerationEnabled = await settingProvider.GetAsync<bool>(
-                AISettings.ManualGenerationEnabled, defaultValue: false)
+                AISettings.ManualGenerationEnabled, defaultValue: false),
+            ReportingEnabled = await settingProvider.GetAsync<bool>(
+                AISettings.ReportingEnabled, defaultValue: false)
         };
 
         return View("~/Views/Settings/AISettingGroup/Default.cshtml", model);
@@ -31,6 +33,7 @@ public class AISettingScriptBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
+            context.Files.Add("/Views/Shared/Scripts/AiLegalDisclaimer.js");
             context.Files.Add("/Views/Settings/AISettingGroup/Default.js");
         }
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewModel.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewModel.cs
index f7dfa675c4..e8fb44056a 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewModel.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/AISettingViewModel.cs
@@ -4,4 +4,5 @@ public class AISettingViewModel
 {
     public bool AutomaticGenerationEnabled { get; set; }
     public bool ManualGenerationEnabled { get; set; }
+    public bool ReportingEnabled { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.cshtml
index 0a83cf001b..0db5e022dd 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.cshtml
@@ -1,8 +1,11 @@
+@using Microsoft.Extensions.Localization
+@using Unity.AI.Localization
 @model Unity.AI.Web.Views.Settings.AISettingGroup.AISettingViewModel
+@inject IStringLocalizer<AIResource> L
 
 <div class="container-fluid px-0">
     <div class="unity-page-titlebar">
-        <h4 class="m-0">AI Configuration</h4>
+        <h4 class="m-0">@L["AISettingGroup:Title"]</h4>
     </div>
 
     <div class="row">
@@ -18,14 +21,14 @@
                                    value="true"
                                    @(Model.AutomaticGenerationEnabled ? "checked" : "") />
                             <label class="form-check-label fw-bold" for="AutomaticGenerationEnabled">
-                                Automatically Generate AI Analysis
+                                @L["Setting:AI.AutomaticGenerationEnabled"]
                             </label>
                             <div class="text-muted small">
-                                When enabled, AI analysis runs automatically on new application intake (subject to form-level AI configuration).
+                                @L["Setting:AI.AutomaticGenerationEnabled:Description"]
                             </div>
                         </div>
 
-                        <div class="form-check form-switch">
+                        <div class="form-check form-switch mb-3">
                             <input class="form-check-input"
                                    type="checkbox"
                                    id="ManualGenerationEnabled"
@@ -33,10 +36,25 @@
                                    value="true"
                                    @(Model.ManualGenerationEnabled ? "checked" : "") />
                             <label class="form-check-label fw-bold" for="ManualGenerationEnabled">
-                                Manually Initiate AI Analysis
+                                @L["Setting:AI.ManualGenerationEnabled"]
+                            </label>
+                            <div class="text-muted small">
+                                @L["Setting:AI.ManualGenerationEnabled:Description"]
+                            </div>
+                        </div>
+
+                        <div class="form-check form-switch">
+                            <input class="form-check-input"
+                                   type="checkbox"
+                                   id="ReportingEnabled"
+                                   name="ReportingEnabled"
+                                   value="true"
+                                   @(Model.ReportingEnabled ? "checked" : "") />
+                            <label class="form-check-label fw-bold" for="ReportingEnabled">
+                                @L["Setting:AI.ReportingEnabled"]
                             </label>
                             <div class="text-muted small">
-                                When enabled, users with appropriate permissions can manually generate or regenerate AI analysis.
+                                @L["Setting:AI.ReportingEnabled:Description"]
                             </div>
                         </div>
                     </abp-column>
@@ -46,13 +64,13 @@
                     <hr class="my-4" />
                     <div class="d-flex p-2">
                         <abp-button id="AISettingsSaveButton"
-                                    text="Save Changes"
+                                    text="@L["AISettingGroup:SaveChanges"].Value"
                                     button-type="Primary"
                                     class="me-2"
                                     type="submit" />
 
                         <abp-button id="AISettingsDiscardButton"
-                                    text="Discard Changes"
+                                    text="@L["AISettingGroup:DiscardChanges"].Value"
                                     button-type="Light"
                                     class="me-2"
                                     disabled="true" />
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.js b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.js
index b956d5bfe6..9427a6fad3 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Settings/AISettingGroup/Default.js
@@ -7,12 +7,35 @@ $(function () {
 
     let initialFormState = uiElements.settingForm.serialize();
 
+    let lastSavedValues = {
+        automaticGenerationEnabled: $('#AutomaticGenerationEnabled').is(':checked'),
+        manualGenerationEnabled: $('#ManualGenerationEnabled').is(':checked'),
+        reportingEnabled: $('#ReportingEnabled').is(':checked')
+    };
+
     function checkFormChanges() {
         let isFormChanged = uiElements.settingForm.serialize() !== initialFormState;
         uiElements.saveButton.prop('disabled', !isFormChanged);
         uiElements.discardButton.prop('disabled', !isFormChanged);
     }
 
+    function saveSettings(automaticEnabled, manualEnabled, reportingEnabled) {
+        unity.aI.settings.aIConfiguration.updateTenantConfiguration({
+            automaticGenerationEnabled: automaticEnabled,
+            manualGenerationEnabled: manualEnabled,
+            reportingEnabled: reportingEnabled
+        }).then(function () {
+            lastSavedValues = {
+                automaticGenerationEnabled: automaticEnabled,
+                manualGenerationEnabled: manualEnabled,
+                reportingEnabled: reportingEnabled
+            };
+            $(document).trigger('AbpSettingSaved');
+            initialFormState = uiElements.settingForm.serialize();
+            checkFormChanges();
+        });
+    }
+
     uiElements.settingForm.on('change', function () {
         checkFormChanges();
     });
@@ -22,14 +45,13 @@ $(function () {
 
         const automaticEnabled = $('#AutomaticGenerationEnabled').is(':checked');
         const manualEnabled = $('#ManualGenerationEnabled').is(':checked');
+        const reportingEnabled = $('#ReportingEnabled').is(':checked');
+        const turningOn = (automaticEnabled && !lastSavedValues.automaticGenerationEnabled) ||
+            (manualEnabled && !lastSavedValues.manualGenerationEnabled) ||
+            (reportingEnabled && !lastSavedValues.reportingEnabled);
 
-        unity.aI.settings.aIConfiguration.updateTenantConfiguration({
-            automaticGenerationEnabled: automaticEnabled,
-            manualGenerationEnabled: manualEnabled
-        }).then(function () {
-            $(document).trigger('AbpSettingSaved');
-            initialFormState = uiElements.settingForm.serialize();
-            checkFormChanges();
+        unity.aI.legalDisclaimer.confirmIfNeeded(turningOn, function () {
+            saveSettings(automaticEnabled, manualEnabled, reportingEnabled);
         });
     });
 
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/AIConfigurationViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/AIConfigurationViewComponent.cs
index a2de10dd7a..87e6120012 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/AIConfigurationViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/AIConfigurationViewComponent.cs
@@ -37,6 +37,8 @@ public class AIConfigurationScriptBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
+            context.Files
+                .Add("/Views/Shared/Scripts/AiLegalDisclaimer.js");
             context.Files
                 .Add("/Views/Shared/Components/AIConfiguration/Default.js");
         }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/Default.js
index 8527f3422b..fd9fbde05b 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIConfiguration/Default.js
@@ -28,21 +28,32 @@ $(function () {
     }
 
     function handleSave() {
+        const automaticEnabled = UIElements.automaticCheckbox.is(':checked');
+        const manualEnabled = UIElements.manualCheckbox.is(':checked');
+        const turningOn = (automaticEnabled && !lastSavedAIValues.automaticallyGenerateAIAnalysis) ||
+            (manualEnabled && !lastSavedAIValues.manuallyInitiateAIAnalysis);
+
+        unity.aI.legalDisclaimer.confirmIfNeeded(turningOn, function () {
+            saveAiConfig(automaticEnabled, manualEnabled);
+        });
+    }
+
+    function saveAiConfig(automaticEnabled, manualEnabled) {
         UIElements.btnSave.prop('disabled', true);
 
         abp.ajax({
             url: `/api/app/application-form/${UIElements.formId.val()}/ai-config`,
             type: 'PATCH',
             data: JSON.stringify({
-                automaticallyGenerateAIAnalysis: UIElements.automaticCheckbox.is(':checked'),
-                manuallyInitiateAIAnalysis: UIElements.manualCheckbox.is(':checked')
+                automaticallyGenerateAIAnalysis: automaticEnabled,
+                manuallyInitiateAIAnalysis: manualEnabled
             }),
             contentType: 'application/json'
         })
             .done(function () {
                 lastSavedAIValues = {
-                    automaticallyGenerateAIAnalysis: UIElements.automaticCheckbox.is(':checked'),
-                    manuallyInitiateAIAnalysis: UIElements.manualCheckbox.is(':checked')
+                    automaticallyGenerateAIAnalysis: automaticEnabled,
+                    manuallyInitiateAIAnalysis: manualEnabled
                 };
                 abp.notify.success('AI configuration saved successfully.');
             })
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Scripts/AiLegalDisclaimer.js b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Scripts/AiLegalDisclaimer.js
new file mode 100644
index 0000000000..6bdbe283ce
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Scripts/AiLegalDisclaimer.js
@@ -0,0 +1,23 @@
+(function () {
+    window.unity = window.unity || {};
+    unity.aI = unity.aI || {};
+
+    unity.aI.legalDisclaimer = {
+        confirmIfNeeded: function (turningOn, onConfirmed) {
+            if (!turningOn) {
+                onConfirmed();
+                return;
+            }
+
+            const modal = new abp.ModalManager({
+                viewUrl: abp.appPath + 'Settings/LegalDisclaimerModal'
+            });
+
+            modal.onResult(function () {
+                onConfirmed();
+            });
+
+            modal.open();
+        }
+    };
+})();
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/ScoresheetInstances/IScoresheetInstanceRepository.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/ScoresheetInstances/IScoresheetInstanceRepository.cs
index 6e7a0f5e67..f0132c7eba 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/ScoresheetInstances/IScoresheetInstanceRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/ScoresheetInstances/IScoresheetInstanceRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
 
@@ -8,5 +8,6 @@ public interface IScoresheetInstanceRepository : IBasicRepository<ScoresheetInst
     {
         Task<ScoresheetInstance?> GetByCorrelationAsync(Guid correlationId);
         Task<ScoresheetInstance?> GetWithAnswersAsync(Guid scoresheetInstanceId);
+        Task<bool> AnyByScoresheetAsync(Guid scoresheetId);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/ScoresheetInstanceRepository.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/ScoresheetInstanceRepository.cs
index 92145196d3..1a38264d08 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/ScoresheetInstanceRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/ScoresheetInstanceRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
@@ -17,6 +17,12 @@ public class ScoresheetInstanceRepository(IDbContextProvider<FlexDbContext> dbCo
                     .FirstOrDefaultAsync(s => s.CorrelationId == correlationId);
         }
 
+        public async Task<bool> AnyByScoresheetAsync(Guid scoresheetId)
+        {
+            var dbContext = await GetDbContextAsync();
+            return await dbContext.ScoresheetInstances.AnyAsync(instance => instance.ScoresheetId == scoresheetId);
+        }
+
         public async Task<ScoresheetInstance?> GetWithAnswersAsync(Guid scoresheetInstanceId)
         {
             var dbSet = await GetDbSetAsync();
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index f350797571..f5f7b3224d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -110,9 +110,17 @@ public async Task<HttpResponseMessage> SendCommentNotification(EmailCommentDto i
                 string commentLink = input.CommentType switch
                 {
                     Comments.CommentType.ApplicationComment or Comments.CommentType.AssessmentComment =>
-                        QueryHelpers.AddQueryString($"{baseUrl}/GrantApplications/Details", "ApplicationId", input.OwnerId),
+                        QueryHelpers.AddQueryString($"{baseUrl}/GrantApplications/Details", new Dictionary<string, string?>
+                        {
+                            ["ApplicationId"] = input.OwnerId,
+                            ["TenantId"] = CurrentTenant.Id?.ToString()
+                        }),
                     Comments.CommentType.ApplicantComment =>
-                        QueryHelpers.AddQueryString($"{baseUrl}/GrantApplicants/Details", "ApplicantId", input.OwnerId),
+                        QueryHelpers.AddQueryString($"{baseUrl}/GrantApplicants/Details", new Dictionary<string, string?>
+                        {
+                            ["ApplicantId"] = input.OwnerId,
+                            ["TenantId"] = CurrentTenant.Id?.ToString()
+                        }),
                     _ => throw new InvalidOperationException("Invalid comment type.")
                 };
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css
index 1567fe83c5..870d90080c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css
@@ -367,11 +367,6 @@ thead input {
     background-color: var(--bc-colors-blue-background, #38598A);
 }
 
-.abp-widget-wrapper {
-    top: 0;
-    z-index: 2;
-}
-
 td.dt-editable {
     cursor: pointer;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormVersionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormVersionService.cs
index ee59592b06..2c9d1bc64a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormVersionService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormVersionService.cs
@@ -1,31 +1,40 @@
-using Newtonsoft.Json.Linq;
-using System;
-using System.Threading.Tasks;
-using Unity.GrantManager.ApplicationForms.Mapping;
-using Unity.GrantManager.Forms;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-namespace Unity.GrantManager.ApplicationForms
-{
-    public interface IApplicationFormVersionAppService : ICrudAppService<
-            ApplicationFormVersionDto,
-            Guid,
-            PagedAndSortedResultRequestDto,
-            CreateUpdateApplicationFormVersionDto>
-    {
-        Task<bool> FormVersionExists(string chefsFormVersionId);
-        Task<bool> InitializePublishedFormVersion(dynamic chefsForm, Guid applicationFormId, bool initializePublishedOnly);
-        Task<string?> GetFormVersionSubmissionMapping(string chefsFormVersionId);
-        Task<ApplicationFormVersionDto> UpdateOrCreateApplicationFormVersion(string chefsFormId, string chefsFormVersionId, Guid applicationFormId, dynamic chefsFormVersion);
-        Task<ApplicationFormVersionDto?> TryInitializeApplicationFormVersionWithToken(JToken token, Guid applicationFormId, string formVersionId, bool published);
-        Task<ApplicationFormVersionDto?> TryInitializeApplicationFormVersion(string? formId, int version, Guid applicationFormId, string formVersionId, bool published);
-        Task<ApplicationFormVersionDto?> GetByChefsFormVersionId(Guid chefsFormVersionId);
-        Task<int> GetFormVersionByApplicationIdAsync(Guid applicationId);
+using Newtonsoft.Json.Linq;
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.ApplicationForms.Mapping;
+using Unity.GrantManager.Forms;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.ApplicationForms
+{
+    public interface IApplicationFormVersionAppService : ICrudAppService<
+            ApplicationFormVersionDto,
+            Guid,
+            PagedAndSortedResultRequestDto,
+            CreateUpdateApplicationFormVersionDto>
+    {
+        Task<bool> FormVersionExists(string chefsFormVersionId);
+        Task<bool> InitializePublishedFormVersion(dynamic chefsForm, Guid applicationFormId, bool initializePublishedOnly);
+        Task<string?> GetFormVersionSubmissionMapping(string chefsFormVersionId);
+        Task<ApplicationFormVersionDto> UpdateOrCreateApplicationFormVersion(string chefsFormId, string chefsFormVersionId, Guid applicationFormId, dynamic chefsFormVersion);
+        Task<ApplicationFormVersionDto?> TryInitializeApplicationFormVersionWithToken(JToken token, Guid applicationFormId, string formVersionId, bool published);
+        Task<ApplicationFormVersionDto?> TryInitializeApplicationFormVersion(string? formId, int version, Guid applicationFormId, string formVersionId, bool published);
+        Task<ApplicationFormVersionDto?> GetByChefsFormVersionId(Guid chefsFormVersionId);
+        Task<int> GetFormVersionByApplicationIdAsync(Guid applicationId);
         Task DeleteWorkSheetMappingByFormName(string formName, Guid formVersionId);
         Task<ApplicationFormMappingDto> GenerateMappingAsync(Guid id);
         Task<AiWorksheetReviewDto?> GetPendingAiWorksheetAsync(Guid formVersionId);
         Task CreateAiWorksheetDraftAsync(Guid formVersionId, CreateAiWorksheetDraftDto input);
         Task DiscardAiWorksheetSuggestionsAsync(Guid formVersionId);
+        Task<AiScoresheetReviewDto?> GetPendingAiScoresheetAsync(Guid formVersionId);
+        Task CreateAiScoresheetDraftAsync(Guid formVersionId, CreateAiScoresheetDraftDto input);
+        Task DiscardAiScoresheetSuggestionsAsync(Guid formVersionId);
+        Task<FormMappingReviewDto> GetMappingReviewAsync(Guid formVersionId);
+        Task<AcceptMappingSuggestionsResultDto> AcceptMappingSuggestionsAsync(Guid formVersionId, AcceptMappingSuggestionsDto input);
+        Task DiscardMappingSuggestionsAsync(Guid formVersionId);
+        Task SetMappingReviewPhaseAsync(Guid formVersionId, FormMappingReviewPhase phase);
+        Task FinalizeMappingReviewAsync(Guid formVersionId);
+        Task ResetAiFlowAsync(Guid formVersionId);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AcceptMappingSuggestionsDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AcceptMappingSuggestionsDto.cs
new file mode 100644
index 0000000000..0593bd4312
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AcceptMappingSuggestionsDto.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public sealed class AcceptMappingSuggestionsDto
+{
+    public List<Guid> SuggestionIds { get; set; } = [];
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AcceptMappingSuggestionsResultDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AcceptMappingSuggestionsResultDto.cs
new file mode 100644
index 0000000000..618a711982
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AcceptMappingSuggestionsResultDto.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public sealed class AcceptMappingSuggestionsResultDto
+{
+    public string SubmissionHeaderMapping { get; set; } = "{}";
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AiScoresheetReviewDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AiScoresheetReviewDto.cs
new file mode 100644
index 0000000000..5b4e5cf92c
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/AiScoresheetReviewDto.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public sealed class AiScoresheetReviewDto
+{
+    public Guid SessionId { get; set; }
+    public string Title { get; set; } = string.Empty;
+    public List<AiScoresheetReviewSectionDto> Sections { get; set; } = [];
+}
+
+public sealed class AiScoresheetReviewSectionDto
+{
+    public Guid Id { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public uint Order { get; set; }
+    public List<AiScoresheetReviewQuestionDto> Questions { get; set; } = [];
+}
+
+public sealed class AiScoresheetReviewQuestionDto
+{
+    public Guid Id { get; set; }
+    public Guid SectionId { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string Label { get; set; } = string.Empty;
+    public string? Description { get; set; }
+    public string Type { get; set; } = string.Empty;
+    public bool Selected { get; set; } = true;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/CreateAiScoresheetDraftDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/CreateAiScoresheetDraftDto.cs
new file mode 100644
index 0000000000..435f4d9d72
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/CreateAiScoresheetDraftDto.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public sealed class CreateAiScoresheetDraftDto
+{
+    public Guid SessionId { get; set; }
+
+    [Required]
+    public string Title { get; set; } = string.Empty;
+
+    [MinLength(1)]
+    public List<Guid> SelectedQuestionIds { get; set; } = [];
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingReviewDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingReviewDto.cs
new file mode 100644
index 0000000000..f9ad45cf80
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingReviewDto.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public class FormMappingReviewDto
+{
+    public Guid FormVersionId { get; set; }
+    public int Sequence { get; set; }
+    public GenerationReviewStatus Status { get; set; }
+    public FormMappingReviewPhase Phase { get; set; }
+    public FormGenerationWorkflowState WorkflowState { get; set; }
+    public FormGenerationWorkflowAction WorkflowAction { get; set; }
+    public string State { get; set; } = string.Empty;
+    public string Action { get; set; } = string.Empty;
+    public List<FormGenerationWorkflowAction> AvailableActions { get; set; } = [];
+    public bool ActionEnabled { get; set; }
+    public string StateLabel { get; set; } = string.Empty;
+    public string ActionLabel { get; set; } = string.Empty;
+    public List<FormMappingSuggestionDto> PendingSuggestions { get; set; } = [];
+    public int UnchangedSuggestionCount { get; set; }
+    public bool NoSuggestionsGenerated { get; set; }
+    public bool NoWorksheetSuggestionsGenerated { get; set; }
+    public List<Guid> DraftWorksheetIds { get; set; } = [];
+    public bool CanGenerateFinalMapping { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingReviewPayload.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingReviewPayload.cs
new file mode 100644
index 0000000000..cddb445803
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingReviewPayload.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public sealed class FormMappingReviewPayload
+{
+    public List<FormMappingSuggestionDto> PendingSuggestions { get; set; } = [];
+    public int UnchangedSuggestionCount { get; set; }
+    public bool NoSuggestionsGenerated { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingSuggestionDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingSuggestionDto.cs
new file mode 100644
index 0000000000..1d52982e6f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormMappingSuggestionDto.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public class FormMappingSuggestionDto
+{
+    public Guid Id { get; set; }
+    public string SourceField { get; set; } = string.Empty;
+    public string TargetField { get; set; } = string.Empty;
+    public string Reason { get; set; } = string.Empty;
+    public decimal Confidence { get; set; }
+    public string ChangeType { get; set; } = "New";
+    public string? PreviousTargetField { get; set; }
+    public string? ConflictSourceField { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormWorksheetReviewPayload.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormWorksheetReviewPayload.cs
new file mode 100644
index 0000000000..9d5b2254b8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/Mapping/FormWorksheetReviewPayload.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public sealed class FormWorksheetReviewPayload
+{
+    public List<Guid> DraftWorksheetIds { get; set; } = [];
+    public bool NoSuggestionsGenerated { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJobArgs.cs
index 19d8c996c4..5320c270bb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJobArgs.cs
@@ -11,6 +11,8 @@ public sealed class AIGenerationBackgroundJobArgs
 
     public Guid OperationId { get; set; }
 
+    public Guid? GenerationRequestId { get; set; }
+
     public Guid? TenantId { get; set; }
 
     public Guid? RequestedByUserId { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
index 2211f051f5..1a8192eb69 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
@@ -1,5 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Localization;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -8,12 +10,15 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Unity.AI.Features;
+using Unity.AI.Localization;
 using Unity.AI.Generation;
 using Unity.AI.Operations;
 using Unity.AI.Permissions;
 using Unity.AI.Requests;
 using Unity.AI.Runtime.Execution;
 using Unity.Flex.Domain.Worksheets;
+using Unity.Flex.Domain.Scoresheets;
+using Unity.Flex.Scoresheets.Enums;
 using Unity.GrantManager.ApplicationForms.Mapping;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Forms;
@@ -29,6 +34,11 @@
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Features;
 using Volo.Abp.Uow;
+using Unity.Flex.Domain.WorksheetLinks;
+using Unity.Flex.Domain.WorksheetInstances;
+using Unity.Flex.Domain.ScoresheetInstances;
+using Unity.Flex.Permissions;
+using Unity.Modules.Shared.Correlation;
 
 namespace Unity.GrantManager.ApplicationForms
 {
@@ -41,9 +51,15 @@ public class ApplicationFormVersionAppService(
         IApplicationFormSubmissionRepository formSubmissionRepository,
         IReportingFieldsGeneratorService reportingFieldsGeneratorService,
         IFeatureChecker featureChecker,
+        IStringLocalizer<AIResource> localizer,
         IAIGenerationAppService aiGenerationAppService,
         IWorksheetRepository worksheetRepository,
-        IRepository<CustomField, Guid> customFieldRepository) :
+        IRepository<CustomField, Guid> customFieldRepository,
+        IGenerationReviewRepository generationReviewRepository,
+        IWorksheetLinkRepository worksheetLinkRepository,
+        IScoresheetRepository scoresheetRepository,
+        IWorksheetInstanceRepository worksheetInstanceRepository,
+        IScoresheetInstanceRepository scoresheetInstanceRepository) :
         CrudAppService<
             ApplicationFormVersion,
             ApplicationFormVersionDto,
@@ -58,6 +74,7 @@ public override async Task<ApplicationFormVersionDto> CreateAsync(CreateUpdateAp
             await base.CreateAsync(input);
 
         [RemoteService(false)]
+        [Authorize]
         public override async Task<ApplicationFormVersionDto> UpdateAsync(Guid id, CreateUpdateApplicationFormVersionDto input) =>
             await base.UpdateAsync(id, input);
 
@@ -338,6 +355,13 @@ public async Task DeleteWorkSheetMappingByFormName(string formName, Guid formVer
         public virtual async Task<ApplicationFormMappingDto> GenerateMappingAsync(Guid id)
         {
             var applicationFormVersion = await Repository.GetAsync(id);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormMapping,
+                id);
+            if (review?.Status == GenerationReviewStatus.Active)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormGenerationReviewActive]);
+            }
             await _aiGenerationAppService.SubmitAsync(
                 AIGenerationOperations.FormMapping,
                 new AIGenerationSubmissionDto
@@ -352,6 +376,204 @@ await _aiGenerationAppService.SubmitAsync(
             };
         }
 
+        [HttpGet("api/app/application-form-version/mapping-review")]
+        public virtual async Task<FormMappingReviewDto> GetMappingReviewAsync(Guid formVersionId)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.ViewFormMapping);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormMapping,
+                formVersionId);
+            return await MapMappingReviewAsync(formVersionId, review);
+        }
+
+        [HttpPost("api/app/application-form-version/accept-mapping-suggestions")]
+        public virtual async Task<AcceptMappingSuggestionsResultDto> AcceptMappingSuggestionsAsync(
+            Guid formVersionId,
+            AcceptMappingSuggestionsDto input)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormMapping);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                    AIGenerationOperations.FormMapping,
+                    formVersionId)
+                ?? throw new UserFriendlyException(localizer[AILocalizationKeys.MappingReviewPending]);
+            if (review.Status != GenerationReviewStatus.Active)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.MappingReviewInactive]);
+            }
+
+            var suggestionIds = input?.SuggestionIds?.Distinct().ToHashSet() ?? [];
+            if (suggestionIds.Count == 0)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.MappingSelectionRequired]);
+            }
+
+            var payload = GetMappingReviewPayload(review);
+            var selectedSuggestions = payload.PendingSuggestions
+                .Where(suggestion => suggestionIds.Contains(suggestion.Id))
+                .ToList();
+            if (selectedSuggestions.Count != suggestionIds.Count)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.MappingSelectionInvalid]);
+            }
+
+            var formVersion = await Repository.GetAsync(formVersionId);
+            formVersion.SubmissionHeaderMapping = FormMappingResponseMapper.MergeSubmissionHeaderMapping(
+                formVersion.SubmissionHeaderMapping,
+                selectedSuggestions.Select(suggestion => new FormMappingDto
+                {
+                    SourceField = suggestion.SourceField,
+                    TargetField = suggestion.TargetField
+                }),
+                replaceExisting: review.Sequence > 1 && review.Sequence % 2 == 0);
+            await Repository.UpdateAsync(formVersion, true);
+            payload.PendingSuggestions.RemoveAll(suggestion => suggestionIds.Contains(suggestion.Id));
+            SetMappingReviewPayload(review, payload);
+            await generationReviewRepository.UpdateAsync(review, true);
+
+            return new AcceptMappingSuggestionsResultDto
+            {
+                SubmissionHeaderMapping = formVersion.SubmissionHeaderMapping
+            };
+        }
+
+        [HttpPost("api/app/application-form-version/discard-mapping-suggestions")]
+        public virtual async Task DiscardMappingSuggestionsAsync(Guid formVersionId)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormMapping);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormMapping,
+                formVersionId);
+            if (review == null)
+            {
+                return;
+            }
+
+            var payload = GetMappingReviewPayload(review);
+            payload.PendingSuggestions = [];
+            review.Discard();
+            SetMappingReviewPayload(review, payload);
+            await generationReviewRepository.UpdateAsync(review, true);
+        }
+
+        [HttpPost("api/app/application-form-version/mapping-review-phase")]
+        public virtual async Task SetMappingReviewPhaseAsync(Guid formVersionId, FormMappingReviewPhase phase)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormMapping);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormMapping,
+                formVersionId);
+            if (review == null || review.Status != GenerationReviewStatus.Active)
+            {
+                if (phase == FormMappingReviewPhase.WorksheetReview &&
+                    review?.Sequence == 1)
+                {
+                    review.Complete();
+                    await generationReviewRepository.UpdateAsync(review, true);
+                    return;
+                }
+
+                if (phase == FormMappingReviewPhase.Completed && review != null)
+                {
+                    return;
+                }
+
+                if (phase != FormMappingReviewPhase.WorksheetReview)
+                {
+                    throw new UserFriendlyException(localizer[AILocalizationKeys.MappingReviewPending]);
+                }
+
+                return;
+            }
+
+            var payload = GetMappingReviewPayload(review);
+            if (phase == FormMappingReviewPhase.WorksheetReview)
+            {
+                if (payload.PendingSuggestions.Count > 0)
+                {
+                    throw new UserFriendlyException(localizer[AILocalizationKeys.MappingReviewPendingSuggestions]);
+                }
+
+                review.Complete();
+            }
+            else if (phase == FormMappingReviewPhase.Completed)
+            {
+                review.Complete();
+            }
+            else
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.MappingReviewTransitionInvalid]);
+            }
+
+            SetMappingReviewPayload(review, payload);
+            await generationReviewRepository.UpdateAsync(review, true);
+        }
+
+        [HttpPost("api/app/application-form-version/reset-ai-flow")]
+        public virtual async Task ResetAiFlowAsync(Guid formVersionId)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormMapping);
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormWorksheet);
+            var formVersion = await Repository.GetAsync(formVersionId);
+            var mappingReviews = await generationReviewRepository.GetListByOperationAndFormVersionAsync(AIGenerationOperations.FormMapping, formVersionId);
+            var worksheetReviews = await generationReviewRepository.GetListByOperationAndFormVersionAsync(AIGenerationOperations.FormWorksheet, formVersionId);
+            var worksheetIds = worksheetReviews
+                .SelectMany(review => GetWorksheetReviewPayload(review).DraftWorksheetIds)
+                .Distinct()
+                .ToList();
+            var suggestionWorksheet = await worksheetRepository.GetByNameAsync(
+                AiWorksheetSuggestionName.Build(formVersion.ApplicationFormId, formVersion.Id), true);
+            if (suggestionWorksheet != null && !worksheetIds.Contains(suggestionWorksheet.Id))
+            {
+                worksheetIds.Add(suggestionWorksheet.Id);
+            }
+
+            foreach (var worksheetId in worksheetIds)
+            {
+                var worksheet = await worksheetRepository.FindAsync(worksheetId);
+                if (worksheet == null)
+                {
+                    continue;
+                }
+
+                await DeleteAiWorksheetSuggestionAsync(worksheet, formVersionId);
+            }
+            await generationReviewRepository.DeleteManyAsync(mappingReviews.Concat(worksheetReviews), true);
+            formVersion.SubmissionHeaderMapping = "{}";
+            await Repository.UpdateAsync(formVersion, true);
+        }
+
+        [HttpPost("api/app/application-form-version/finalize-mapping-review")]
+        public virtual async Task FinalizeMappingReviewAsync(Guid formVersionId)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormMapping);
+            var formVersion = await Repository.GetAsync(formVersionId);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                    AIGenerationOperations.FormMapping,
+                    formVersionId)
+                ?? throw new UserFriendlyException(localizer[AILocalizationKeys.MappingReviewPending]);
+            var worksheetReview = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormWorksheet,
+                formVersionId);
+            if (review.Sequence % 2 == 0 ||
+                review.Status == GenerationReviewStatus.Active ||
+                worksheetReview == null ||
+                worksheetReview.Status == GenerationReviewStatus.Active ||
+                GetWorksheetReviewPayload(worksheetReview).NoSuggestionsGenerated ||
+                !await HasNoRemainingDraftsOrAssignedDraftAsync(worksheetReview))
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.WorksheetDraftsMustBePublished]);
+            }
+            review.Complete();
+            await generationReviewRepository.UpdateAsync(review, true);
+            await _aiGenerationAppService.SubmitAsync(
+                AIGenerationOperations.FormMapping,
+                new AIGenerationSubmissionDto
+                {
+                    ApplicationId = formVersion.ApplicationFormId,
+                    ApplicationFormVersionId = formVersionId
+                });
+        }
+
         [HttpGet("api/app/application-form-version/pending-ai-worksheet")]
         public virtual async Task<AiWorksheetReviewDto?> GetPendingAiWorksheetAsync(Guid formVersionId)
         {
@@ -365,36 +587,35 @@ await _aiGenerationAppService.SubmitAsync(
         public virtual async Task CreateAiWorksheetDraftAsync(Guid formVersionId, CreateAiWorksheetDraftDto input)
         {
             await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormWorksheet);
-
             var worksheet = await GetPendingAiWorksheetEntityAsync(formVersionId);
             if (worksheet == null || worksheet.Id != input.SessionId)
             {
-                throw new UserFriendlyException("The AI worksheet is no longer available for review.");
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormWorksheetUnavailable]);
             }
 
             var title = input.Title?.Trim();
             if (string.IsNullOrWhiteSpace(title))
             {
-                throw new UserFriendlyException("A worksheet title is required.");
+                throw new UserFriendlyException(localizer[AILocalizationKeys.WorksheetTitleRequired]);
             }
 
             var selectedFieldIds = input.SelectedFieldIds?.ToHashSet() ?? [];
             if (selectedFieldIds.Count == 0)
             {
-                throw new UserFriendlyException("Select at least one suggested field.");
+                throw new UserFriendlyException(localizer[AILocalizationKeys.WorksheetSelectionRequired]);
             }
 
             var fields = worksheet.Sections.SelectMany(section => section.Fields).ToList();
             var unknownFieldIds = selectedFieldIds.Except(fields.Select(field => field.Id)).ToList();
             if (unknownFieldIds.Count > 0)
             {
-                throw new UserFriendlyException("The AI worksheet selection is invalid.");
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormWorksheetSelectionInvalid]);
             }
 
             var draftName = await GetNextAiWorksheetDraftNameAsync(title);
-            var draft = new Worksheet(Guid.NewGuid(), draftName, title);
+            var draft = new Worksheet(GuidGenerator.Create(), draftName, title);
 
-            var draftSection = new WorksheetSection(Guid.NewGuid(), "Suggested Fields")
+            var draftSection = new WorksheetSection(GuidGenerator.Create(), "Suggested Fields")
             {
                 Worksheet = draft
             }.SetOrder(1);
@@ -407,7 +628,7 @@ public virtual async Task CreateAiWorksheetDraftAsync(Guid formVersionId, Create
                 .Select((field, index) => (field, index)))
             {
                 var draftField = new CustomField(
-                    Guid.NewGuid(),
+                    GuidGenerator.Create(),
                     field.Key,
                     draft.Name,
                     field.Label,
@@ -420,6 +641,17 @@ public virtual async Task CreateAiWorksheetDraftAsync(Guid formVersionId, Create
 
             await worksheetRepository.InsertAsync(draft, true);
 
+            var worksheetReview = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormWorksheet,
+                formVersionId);
+            if (worksheetReview != null)
+            {
+                var worksheetPayload = GetWorksheetReviewPayload(worksheetReview);
+                worksheetPayload.DraftWorksheetIds.Add(draft.Id);
+                SetWorksheetReviewPayload(worksheetReview, worksheetPayload);
+                await generationReviewRepository.UpdateAsync(worksheetReview);
+            }
+
             foreach (var field in fields.Where(field => selectedFieldIds.Contains(field.Id)))
             {
                 field.Section.RemoveField(field);
@@ -428,7 +660,12 @@ public virtual async Task CreateAiWorksheetDraftAsync(Guid formVersionId, Create
 
             if (worksheet.Sections.All(section => section.Fields.Count == 0))
             {
-                await worksheetRepository.DeleteAsync(worksheet, true);
+                await DeleteAiWorksheetSuggestionAsync(worksheet, formVersionId);
+                if (worksheetReview != null)
+                {
+                    worksheetReview.Complete();
+                    await generationReviewRepository.UpdateAsync(worksheetReview, true);
+                }
                 return;
             }
 
@@ -439,16 +676,233 @@ public virtual async Task CreateAiWorksheetDraftAsync(Guid formVersionId, Create
         public virtual async Task DiscardAiWorksheetSuggestionsAsync(Guid formVersionId)
         {
             await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormWorksheet);
-
             var worksheet = await GetPendingAiWorksheetEntityAsync(formVersionId);
             if (worksheet != null)
             {
-                await worksheetRepository.DeleteAsync(worksheet, true);
+                await DeleteAiWorksheetSuggestionAsync(worksheet, formVersionId);
+                var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                    AIGenerationOperations.FormWorksheet,
+                    formVersionId);
+                if (review != null)
+                {
+                    review.Discard();
+                    await generationReviewRepository.UpdateAsync(review, true);
+                }
+            }
+        }
+
+        [HttpGet("api/app/application-form-version/pending-ai-scoresheet")]
+        public virtual async Task<AiScoresheetReviewDto?> GetPendingAiScoresheetAsync(Guid formVersionId)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.ViewFormScoresheet);
+
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormScoresheet,
+                formVersionId);
+            if (review == null || review.Status != GenerationReviewStatus.Active)
+            {
+                return null;
             }
+
+            var formVersion = await formVersionRepository.GetAsync(formVersionId);
+            var scoresheet = await scoresheetRepository.GetByNameAsync(
+                BuildAiScoresheetSuggestionName(formVersion.ApplicationFormId, formVersion.Id), true);
+            return scoresheet?.Published == false ? MapAiScoresheetReview(scoresheet) : null;
         }
 
+        [HttpPost("api/app/application-form-version/create-ai-scoresheet-draft")]
+        public virtual async Task CreateAiScoresheetDraftAsync(Guid formVersionId, CreateAiScoresheetDraftDto input)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormScoresheet);
+
+            var suggestion = await GetPendingAiScoresheetEntityAsync(formVersionId);
+            if (suggestion == null || suggestion.Id != input.SessionId)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetUnavailable]);
+            }
+
+            var title = input.Title?.Trim();
+            if (string.IsNullOrWhiteSpace(title))
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetTitleRequired]);
+            }
+
+            var selectedIds = input.SelectedQuestionIds?.ToHashSet() ?? [];
+            if (selectedIds.Count == 0)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetSelectionRequired]);
+            }
+
+            var questions = suggestion.Sections.SelectMany(section => section.Fields).ToList();
+            if (selectedIds.Except(questions.Select(question => question.Id)).Any())
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetSelectionInvalid]);
+            }
+
+            var draftName = await GetNextAiScoresheetDraftNameAsync(title);
+            var draft = new Scoresheet(GuidGenerator.Create(), title, draftName);
+            foreach (var sourceSection in suggestion.Sections.OrderBy(section => section.Order))
+            {
+                var selectedQuestions = sourceSection.Fields
+                    .Where(question => selectedIds.Contains(question.Id))
+                    .OrderBy(question => question.Order)
+                    .ToList();
+                if (selectedQuestions.Count == 0)
+                {
+                    continue;
+                }
+
+                var section = new ScoresheetSection(GuidGenerator.Create(), sourceSection.Name, sourceSection.Order);
+                draft.AddSection(section);
+                foreach (var sourceQuestion in selectedQuestions)
+                {
+                    var draftQuestion = new Question(
+                        GuidGenerator.Create(),
+                        sourceQuestion.Name,
+                        sourceQuestion.Label,
+                        sourceQuestion.Type,
+                        sourceQuestion.Order,
+                        sourceQuestion.Description,
+                        sourceQuestion.Definition)
+                    {
+                        SectionId = section.Id
+                    };
+                    section.Fields.Add(draftQuestion);
+                }
+            }
+
+            await scoresheetRepository.InsertAsync(draft, true);
+
+            foreach (var question in questions.Where(question => selectedIds.Contains(question.Id)).ToList())
+            {
+                var sourceSection = suggestion.Sections.First(section => section.Fields.Contains(question));
+                sourceSection.Fields.Remove(question);
+            }
+
+            if (suggestion.Sections.All(section => section.Fields.Count == 0))
+            {
+                await DeleteAiScoresheetSuggestionAsync(suggestion);
+                var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                    AIGenerationOperations.FormScoresheet,
+                    formVersionId);
+                review?.Complete();
+                if (review != null)
+                {
+                    await generationReviewRepository.UpdateAsync(review, true);
+                }
+            }
+            else
+            {
+                await scoresheetRepository.UpdateAsync(suggestion, true);
+            }
+        }
+
+        [HttpPost("api/app/application-form-version/discard-ai-scoresheet-suggestions")]
+        public virtual async Task DiscardAiScoresheetSuggestionsAsync(Guid formVersionId)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.GenerateFormScoresheet);
+            var suggestion = await GetPendingAiScoresheetEntityAsync(formVersionId);
+            if (suggestion == null)
+            {
+                return;
+            }
+
+            await DeleteAiScoresheetSuggestionAsync(suggestion);
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormScoresheet,
+                formVersionId);
+            if (review != null)
+            {
+                review.Discard();
+                await generationReviewRepository.UpdateAsync(review, true);
+            }
+        }
+
+        private async Task<Scoresheet?> GetPendingAiScoresheetEntityAsync(Guid formVersionId)
+        {
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormScoresheet,
+                formVersionId);
+            if (review == null || review.Status != GenerationReviewStatus.Active)
+            {
+                return null;
+            }
+
+            var formVersion = await formVersionRepository.GetAsync(formVersionId);
+            var scoresheet = await scoresheetRepository.GetByNameAsync(
+                BuildAiScoresheetSuggestionName(formVersion.ApplicationFormId, formVersion.Id), true);
+            return scoresheet?.Published == false ? scoresheet : null;
+        }
+
+        private static string BuildAiScoresheetSuggestionName(Guid formId, Guid formVersionId) =>
+            $"ai-form-{formId}-version-{formVersionId}-scoresheet";
+
+        private static AiScoresheetReviewDto MapAiScoresheetReview(Scoresheet scoresheet) => new()
+        {
+            SessionId = scoresheet.Id,
+            Title = scoresheet.Title,
+            Sections = scoresheet.Sections
+                .OrderBy(section => section.Order)
+                .Select(section => new AiScoresheetReviewSectionDto
+                {
+                    Id = section.Id,
+                    Name = section.Name,
+                    Order = section.Order,
+                    Questions = section.Fields.OrderBy(question => question.Order)
+                        .Select(question => new AiScoresheetReviewQuestionDto
+                        {
+                            Id = question.Id,
+                            SectionId = section.Id,
+                            Name = question.Name,
+                            Label = question.Label,
+                            Description = question.Description,
+                            Type = question.Type.ToString(),
+                            Selected = true
+                        }).ToList()
+                }).ToList()
+        };
+
+        private async Task DeleteAiWorksheetSuggestionAsync(Worksheet worksheet, Guid formVersionId)
+        {
+            var links = await worksheetLinkRepository.GetListByWorksheetAsync(worksheet.Id, CorrelationConsts.FormVersion) ?? [];
+            if (worksheet.Published ||
+                links.Any(link => link.CorrelationId != formVersionId) ||
+                await worksheetInstanceRepository.AnyByWorksheetAndFormVersionAsync(worksheet.Id, formVersionId))
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormWorksheetDeleteProtected]);
+            }
+
+            foreach (var link in links.Where(link => link.CorrelationId == formVersionId))
+            {
+                await worksheetLinkRepository.DeleteAsync(link, true);
+            }
+
+            await worksheetRepository.DeleteAsync(worksheet, true);
+        }
+
+        private async Task DeleteAiScoresheetSuggestionAsync(Scoresheet scoresheet)
+        {
+            if (scoresheet.Published || scoresheet.IsArchived)
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetDeleteProtected]);
+            }
+            if (await scoresheetInstanceRepository.AnyByScoresheetAsync(scoresheet.Id))
+            {
+                throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetHasInstances]);
+            }
+
+            await scoresheetRepository.DeleteAsync(scoresheet, true);
+        }
         private async Task<Worksheet?> GetPendingAiWorksheetEntityAsync(Guid formVersionId)
         {
+            var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormWorksheet,
+                formVersionId);
+            if (review == null || review.Status != GenerationReviewStatus.Active)
+            {
+                return null;
+            }
+
             var formVersion = await formVersionRepository.GetAsync(formVersionId);
             var worksheet = await worksheetRepository.GetByNameAsync(
                 AiWorksheetSuggestionName.Build(formVersion.ApplicationFormId, formVersion.Id), true);
@@ -478,6 +932,242 @@ public virtual async Task DiscardAiWorksheetSuggestionsAsync(Guid formVersionId)
                 .ToList()
         };
 
+        private async Task<FormMappingReviewDto> MapMappingReviewAsync(
+            Guid formVersionId,
+            GenerationReview? mappingReview)
+        {
+            var worksheetReview = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormWorksheet,
+                formVersionId);
+            var workflow = await DeriveWorkflowAsync(mappingReview, worksheetReview);
+            var mappingPayload = mappingReview == null
+                ? new FormMappingReviewPayload()
+                : GetMappingReviewPayload(mappingReview);
+            var worksheetPayload = worksheetReview == null
+                ? new FormWorksheetReviewPayload()
+                : GetWorksheetReviewPayload(worksheetReview);
+
+            return new FormMappingReviewDto
+            {
+                FormVersionId = formVersionId,
+                Sequence = mappingReview?.Sequence ?? 0,
+                Status = mappingReview?.Status ?? GenerationReviewStatus.Completed,
+                Phase = GetLegacyPhase(workflow.State),
+                WorkflowState = workflow.State,
+                WorkflowAction = workflow.Action,
+                State = workflow.State.ToString(),
+                Action = workflow.Action.ToString(),
+                AvailableActions = workflow.AvailableActions,
+                ActionEnabled = workflow.ActionEnabled,
+                StateLabel = GetWorkflowLabel(workflow.State),
+                ActionLabel = GetWorkflowLabel(workflow.Action),
+                PendingSuggestions = mappingPayload.PendingSuggestions,
+                UnchangedSuggestionCount = mappingPayload.UnchangedSuggestionCount,
+                NoSuggestionsGenerated = mappingPayload.NoSuggestionsGenerated,
+                NoWorksheetSuggestionsGenerated = worksheetPayload.NoSuggestionsGenerated,
+                DraftWorksheetIds = worksheetPayload.DraftWorksheetIds,
+                CanGenerateFinalMapping = workflow.State == FormGenerationWorkflowState.GenerateFinalMapping
+            };
+        }
+
+        private async Task<FormWorkflowResult> DeriveWorkflowAsync(
+            GenerationReview? mappingReview,
+            GenerationReview? worksheetReview)
+        {
+            if (mappingReview == null)
+            {
+                return FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.GenerateInitialMapping,
+                    FormGenerationWorkflowAction.GenerateInitialMapping,
+                    true);
+            }
+
+            if (mappingReview.Status == GenerationReviewStatus.Active)
+            {
+                var isFinalMapping = mappingReview.Sequence > 1 && mappingReview.Sequence % 2 == 0;
+                var state = !isFinalMapping
+                    ? FormGenerationWorkflowState.ReviewInitialMapping
+                    : FormGenerationWorkflowState.ReviewFinalMapping;
+                var action = !isFinalMapping
+                    ? FormGenerationWorkflowAction.ReviewInitialMapping
+                    : FormGenerationWorkflowAction.ReviewFinalMapping;
+                return FormWorkflowResult.Single(state, action, true);
+            }
+
+            if (mappingReview.Sequence > 1 &&
+                mappingReview.Sequence % 2 == 0 &&
+                worksheetReview?.Status == GenerationReviewStatus.Active)
+            {
+                return FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.ReviewWorksheets,
+                    FormGenerationWorkflowAction.ReviewWorksheets,
+                    true);
+            }
+
+            if (mappingReview.Sequence > 1 && mappingReview.Sequence % 2 == 0)
+            {
+                return new FormWorkflowResult(
+                    FormGenerationWorkflowState.Completed,
+                    FormGenerationWorkflowAction.GenerateMapping,
+                    true,
+                    [
+                        FormGenerationWorkflowAction.GenerateMapping,
+                        FormGenerationWorkflowAction.GenerateWorksheetsNextCycle
+                    ]);
+            }
+
+            if (worksheetReview == null)
+            {
+                return FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.GenerateWorksheets,
+                    FormGenerationWorkflowAction.GenerateWorksheets,
+                    true);
+            }
+
+            if (worksheetReview.Status == GenerationReviewStatus.Active)
+            {
+                return FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.ReviewWorksheets,
+                    FormGenerationWorkflowAction.ReviewWorksheets,
+                    true);
+            }
+
+            if (GetWorksheetReviewPayload(worksheetReview).NoSuggestionsGenerated)
+            {
+                return FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.Completed,
+                    FormGenerationWorkflowAction.GenerateMapping,
+                    true);
+            }
+
+            if (worksheetReview.Status == GenerationReviewStatus.Discarded)
+            {
+                return FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.Completed,
+                    FormGenerationWorkflowAction.GenerateMapping,
+                    true);
+            }
+
+            return await HasNoRemainingDraftsOrAssignedDraftAsync(worksheetReview)
+                ? FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.GenerateFinalMapping,
+                    FormGenerationWorkflowAction.GenerateFinalMapping,
+                    true)
+                : FormWorkflowResult.Single(
+                    FormGenerationWorkflowState.PublishAndAssignWorksheets,
+                    FormGenerationWorkflowAction.PublishAndAssignWorksheets,
+                    false);
+        }
+
+        private async Task<bool> HasNoRemainingDraftsOrAssignedDraftAsync(GenerationReview review)
+        {
+            var draftWorksheetIds = GetWorksheetReviewPayload(review).DraftWorksheetIds;
+            if (draftWorksheetIds.Count == 0)
+            {
+                return true;
+            }
+
+            var linkedWorksheetIds = (await worksheetLinkRepository.GetListByCorrelationAsync(
+                review.ContextId,
+                CorrelationConsts.FormVersion))
+                .Select(link => link.WorksheetId)
+                .ToHashSet();
+
+            var hasRemainingDraft = false;
+
+            foreach (var worksheetId in draftWorksheetIds)
+            {
+                var worksheet = await worksheetRepository.FindAsync(worksheetId);
+                if (worksheet == null)
+                {
+                    continue;
+                }
+
+                hasRemainingDraft = true;
+                if (worksheet.Published && linkedWorksheetIds.Contains(worksheetId))
+                {
+                    return true;
+                }
+            }
+
+            return !hasRemainingDraft;
+        }
+
+        private static FormMappingReviewPhase GetLegacyPhase(FormGenerationWorkflowState state) =>
+            state switch
+            {
+                FormGenerationWorkflowState.ReviewInitialMapping => FormMappingReviewPhase.MappingReview,
+                FormGenerationWorkflowState.GenerateWorksheets or
+                    FormGenerationWorkflowState.ReviewWorksheets => FormMappingReviewPhase.WorksheetReview,
+                FormGenerationWorkflowState.PublishAndAssignWorksheets or
+                    FormGenerationWorkflowState.GenerateFinalMapping => FormMappingReviewPhase.PublishAndAssignWorksheets,
+                FormGenerationWorkflowState.ReviewFinalMapping => FormMappingReviewPhase.FinalMappingReview,
+                _ => FormMappingReviewPhase.Completed
+            };
+
+        private string GetWorkflowLabel(FormGenerationWorkflowState state) =>
+            state switch
+            {
+                FormGenerationWorkflowState.GenerateInitialMapping => localizer[AILocalizationKeys.WorkflowGenerateInitialMapping],
+                FormGenerationWorkflowState.ReviewInitialMapping => localizer[AILocalizationKeys.WorkflowReviewInitialMapping],
+                FormGenerationWorkflowState.GenerateWorksheets => localizer[AILocalizationKeys.WorkflowGenerateWorksheets],
+                FormGenerationWorkflowState.ReviewWorksheets => localizer[AILocalizationKeys.WorkflowReviewWorksheets],
+                FormGenerationWorkflowState.PublishAndAssignWorksheets => localizer[AILocalizationKeys.WorkflowPublishAssignWorksheets],
+                FormGenerationWorkflowState.GenerateFinalMapping => localizer[AILocalizationKeys.WorkflowGenerateFinalMapping],
+                FormGenerationWorkflowState.ReviewFinalMapping => localizer[AILocalizationKeys.WorkflowReviewFinalMapping],
+                _ => localizer[AILocalizationKeys.WorkflowCompleted]
+            };
+
+        private string GetWorkflowLabel(FormGenerationWorkflowAction action) =>
+            action switch
+            {
+                FormGenerationWorkflowAction.GenerateInitialMapping => localizer[AILocalizationKeys.WorkflowGenerateInitialMapping],
+                FormGenerationWorkflowAction.ReviewInitialMapping => localizer[AILocalizationKeys.WorkflowReviewInitialMapping],
+                FormGenerationWorkflowAction.GenerateWorksheets or
+                    FormGenerationWorkflowAction.GenerateWorksheetsNextCycle => localizer[AILocalizationKeys.WorkflowGenerateWorksheets],
+                FormGenerationWorkflowAction.ReviewWorksheets => localizer[AILocalizationKeys.WorkflowReviewWorksheets],
+                FormGenerationWorkflowAction.PublishAndAssignWorksheets => localizer[AILocalizationKeys.WorkflowPublishAssignWorksheets],
+                FormGenerationWorkflowAction.GenerateFinalMapping => localizer[AILocalizationKeys.WorkflowGenerateFinalMapping],
+                FormGenerationWorkflowAction.GenerateMapping => localizer[AILocalizationKeys.WorkflowGenerateMapping],
+                FormGenerationWorkflowAction.ReviewFinalMapping => localizer[AILocalizationKeys.WorkflowReviewFinalMapping],
+                _ => localizer[AILocalizationKeys.WorkflowCompleted]
+            };
+
+        private sealed record FormWorkflowResult(
+            FormGenerationWorkflowState State,
+            FormGenerationWorkflowAction Action,
+            bool ActionEnabled,
+            List<FormGenerationWorkflowAction> AvailableActions)
+        {
+            public static FormWorkflowResult Single(
+                FormGenerationWorkflowState state,
+                FormGenerationWorkflowAction action,
+                bool enabled) =>
+                new(state, action, enabled, [action]);
+        }
+
+        private static FormMappingReviewPayload GetMappingReviewPayload(GenerationReview review) =>
+            string.IsNullOrWhiteSpace(review.ReviewData)
+                ? new FormMappingReviewPayload()
+                : JsonSerializer.Deserialize<FormMappingReviewPayload>(review.ReviewData)
+                    ?? new FormMappingReviewPayload();
+
+        private static void SetMappingReviewPayload(
+            GenerationReview review,
+            FormMappingReviewPayload payload) =>
+            review.SetReviewData(JsonSerializer.Serialize(payload));
+
+        private static FormWorksheetReviewPayload GetWorksheetReviewPayload(GenerationReview review) =>
+            string.IsNullOrWhiteSpace(review.ReviewData)
+                ? new FormWorksheetReviewPayload()
+                : JsonSerializer.Deserialize<FormWorksheetReviewPayload>(review.ReviewData)
+                    ?? new FormWorksheetReviewPayload();
+
+        private static void SetWorksheetReviewPayload(
+            GenerationReview review,
+            FormWorksheetReviewPayload payload) =>
+            review.SetReviewData(JsonSerializer.Serialize(payload));
+
         private async Task<string> GetNextAiWorksheetDraftNameAsync(string title)
         {
             var titlePart = Regex.Replace(title.Trim().ToLowerInvariant(), "[^a-z0-9]+", "-").Trim('-');
@@ -493,6 +1183,21 @@ private async Task<string> GetNextAiWorksheetDraftNameAsync(string title)
             return candidate;
         }
 
+        private async Task<string> GetNextAiScoresheetDraftNameAsync(string title)
+        {
+            var titlePart = Regex.Replace(title.Trim().ToLowerInvariant(), "[^a-z0-9]+", "-").Trim('-');
+            var baseName = $"ai-{(string.IsNullOrEmpty(titlePart) ? "scoresheet" : titlePart)}";
+            var candidate = baseName;
+            var suffix = 2;
+
+            while (await scoresheetRepository.GetByNameAsync(candidate, false) != null)
+            {
+                candidate = $"{baseName}-{suffix++}";
+            }
+
+            return candidate;
+        }
+
         private static string NormalizeCustomFieldDefinition(string definition)
         {
             try
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/Mapping/FormMappingResponseMapper.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/Mapping/FormMappingResponseMapper.cs
index 06860cd8a6..d8a3ca2a8e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/Mapping/FormMappingResponseMapper.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/Mapping/FormMappingResponseMapper.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 using Unity.AI.Responses;
 
@@ -22,13 +25,9 @@ internal static string BuildSubmissionHeaderMapping(FormMappingResponse response
 
             foreach (var property in document.RootElement.EnumerateObject())
             {
-                if (property.Value.ValueKind != JsonValueKind.String)
-                {
-                    return "{}";
-                }
-
-                var chefsField = property.Value.GetString();
-                if (string.IsNullOrWhiteSpace(chefsField) || string.IsNullOrWhiteSpace(property.Name))
+                if (property.Value.ValueKind != JsonValueKind.String
+                    || string.IsNullOrWhiteSpace(property.Value.GetString())
+                    || string.IsNullOrWhiteSpace(property.Name))
                 {
                     return "{}";
                 }
@@ -41,4 +40,89 @@ internal static string BuildSubmissionHeaderMapping(FormMappingResponse response
             return "{}";
         }
     }
+
+    internal static List<FormMappingDto> ParseSuggestions(string mapping)
+    {
+        if (string.IsNullOrWhiteSpace(mapping))
+        {
+            return [];
+        }
+
+        try
+        {
+            using var document = JsonDocument.Parse(mapping);
+            if (document.RootElement.ValueKind != JsonValueKind.Object)
+            {
+                return [];
+            }
+
+            return document.RootElement.EnumerateObject()
+                .Where(property => property.Value.ValueKind == JsonValueKind.String
+                    && !string.IsNullOrWhiteSpace(property.Name)
+                    && !string.IsNullOrWhiteSpace(property.Value.GetString()))
+                .Select(property => new FormMappingDto
+                {
+                    TargetField = property.Name,
+                    SourceField = property.Value.GetString() ?? string.Empty
+                })
+                .ToList();
+        }
+        catch (JsonException)
+        {
+            return [];
+        }
+    }
+
+    internal static string MergeSubmissionHeaderMapping(
+        string? existingMapping,
+        IEnumerable<FormMappingDto> suggestions,
+        bool replaceExisting = false)
+    {
+        var mapping = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        if (!string.IsNullOrWhiteSpace(existingMapping))
+        {
+            try
+            {
+                var existing = JsonSerializer.Deserialize<Dictionary<string, string>>(existingMapping);
+                if (existing != null)
+                {
+                    foreach (var pair in existing.Where(pair =>
+                        !string.IsNullOrWhiteSpace(pair.Key) && !string.IsNullOrWhiteSpace(pair.Value)))
+                    {
+                        mapping[pair.Key] = pair.Value;
+                    }
+                }
+            }
+            catch (JsonException)
+            {
+            }
+        }
+
+        foreach (var suggestion in suggestions)
+        {
+            if (!string.IsNullOrWhiteSpace(suggestion.TargetField)
+                && !string.IsNullOrWhiteSpace(suggestion.SourceField))
+            {
+                if (replaceExisting)
+                {
+                    foreach (var existing in mapping
+                        .Where(pair => pair.Key.Equals(suggestion.TargetField, StringComparison.OrdinalIgnoreCase)
+                            || pair.Value.Equals(suggestion.SourceField, StringComparison.OrdinalIgnoreCase))
+                        .Select(pair => pair.Key)
+                        .ToList())
+                    {
+                        mapping.Remove(existing);
+                    }
+
+                    mapping[suggestion.TargetField] = suggestion.SourceField;
+                }
+                else if (!mapping.ContainsKey(suggestion.TargetField))
+                {
+                    mapping[suggestion.TargetField] = suggestion.SourceField;
+                }
+            }
+        }
+
+        return JsonSerializer.Serialize(mapping);
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIGenerationPrerequisiteValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIGenerationPrerequisiteValidator.cs
index 36ec117a87..3241e7fb9e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIGenerationPrerequisiteValidator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIGenerationPrerequisiteValidator.cs
@@ -7,6 +7,7 @@
 using Unity.AI.Operations;
 using Unity.Flex.Domain.Scoresheets;
 using Unity.GrantManager.Applications;
+using Unity.GrantManager.ApplicationForms;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Linq;
@@ -21,39 +22,32 @@ public class AIGenerationPrerequisiteValidator(
     IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
     IScoresheetRepository scoresheetRepository,
     IAsyncQueryableExecuter asyncExecuter,
-    IStringLocalizer<AIResource> localizer) : IAIGenerationPrerequisiteValidator, ITransientDependency
+    IStringLocalizer<AIResource> localizer,
+    IGenerationReviewRepository generationReviewRepository) : IAIGenerationPrerequisiteValidator, ITransientDependency
 {
-    public Task EnsureAvailableAsync(string operationType, AIGenerationSubmissionDto request)
+    public Task EnsureAvailableAsync(string operationType, AIGenerationSubmissionDto request) => operationType switch
     {
-        return operationType switch
-        {
-            AIGenerationOperations.AttachmentSummary => EnsureAttachmentSummaryAvailableAsync(request.ApplicationId),
-            AIGenerationOperations.ApplicationAnalysis => EnsureApplicationAnalysisAvailableAsync(request.ApplicationId),
-            AIGenerationOperations.ApplicationScoring => EnsureApplicationScoringAvailableAsync(request.ApplicationId),
-            AIGenerationOperations.FormMapping => EnsureFormMappingAvailableAsync(request.ApplicationFormVersionId.GetValueOrDefault()),
-            AIGenerationOperations.FormWorksheet => EnsureFormWorksheetAvailableAsync(request.ApplicationFormVersionId.GetValueOrDefault()),
-            AIGenerationOperations.FormScoresheet => EnsureFormScoresheetAvailableAsync(request.ApplicationFormVersionId.GetValueOrDefault()),
-            _ => throw new UserFriendlyException($"Unsupported AI generation operation type: {operationType}")
-        };
-    }
+        AIGenerationOperations.AttachmentSummary => EnsureAttachmentSummaryAvailableAsync(request.ApplicationId),
+        AIGenerationOperations.ApplicationAnalysis => EnsureApplicationAnalysisAvailableAsync(request.ApplicationId),
+        AIGenerationOperations.ApplicationScoring => EnsureApplicationScoringAvailableAsync(request.ApplicationId),
+        AIGenerationOperations.FormMapping => EnsureFormMappingAvailableAsync(request.ApplicationFormVersionId.GetValueOrDefault()),
+        AIGenerationOperations.FormWorksheet => EnsureFormWorksheetAvailableAsync(request.ApplicationFormVersionId.GetValueOrDefault()),
+        AIGenerationOperations.FormScoresheet => EnsureFormScoresheetAvailableAsync(request.ApplicationFormVersionId.GetValueOrDefault()),
+        _ => throw new UserFriendlyException($"Unsupported AI generation operation type: {operationType}")
+    };
 
     public async Task EnsureAttachmentSummaryAvailableAsync(Guid applicationId)
     {
         var attachmentQuery = await applicationChefsFileAttachmentRepository.GetQueryableAsync();
         var hasAttachments = await asyncExecuter.AnyAsync(attachmentQuery.Where(a => a.ApplicationId == applicationId));
-        if (!hasAttachments)
-        {
-            throw new UserFriendlyException(localizer[AILocalizationKeys.NoAttachmentsAvailable]);
-        }
+        if (!hasAttachments) throw new UserFriendlyException(localizer[AILocalizationKeys.NoAttachmentsAvailable]);
     }
 
     public async Task EnsureApplicationAnalysisAvailableAsync(Guid applicationId)
     {
         var submission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
         if (submission == null || string.IsNullOrWhiteSpace(submission.Submission))
-        {
             throw new UserFriendlyException(localizer[AILocalizationKeys.ApplicationAnalysisRequiresSubmission]);
-        }
     }
 
     public async Task EnsureApplicationScoringAvailableAsync(Guid applicationId)
@@ -61,41 +55,37 @@ public async Task EnsureApplicationScoringAvailableAsync(Guid applicationId)
         var application = await applicationRepository.GetAsync(applicationId);
         var applicationForm = await applicationFormRepository.GetAsync(application.ApplicationFormId);
         if (applicationForm.ScoresheetId == null)
-        {
             throw new UserFriendlyException(localizer[AILocalizationKeys.ScoringRequiresScoresheet]);
-        }
-
         var scoresheet = await scoresheetRepository.GetWithChildrenAsync(applicationForm.ScoresheetId.Value);
         if (scoresheet == null || !scoresheet.Sections.Any() || !scoresheet.Sections.SelectMany(s => s.Fields).Any())
-        {
             throw new UserFriendlyException(localizer[AILocalizationKeys.ScoringRequiresScoresheetFields]);
-        }
     }
 
     public async Task EnsureFormMappingAvailableAsync(Guid applicationFormVersionId)
     {
         var formVersion = await applicationFormVersionRepository.FindAsync(applicationFormVersionId);
-        if (formVersion == null)
-        {
-            throw new UserFriendlyException(localizer[AILocalizationKeys.FormMappingRequiresFormVersion]);
-        }
+        if (formVersion == null) throw new UserFriendlyException(localizer[AILocalizationKeys.FormMappingRequiresFormVersion]);
+        await EnsureNoActiveReviewAsync(AIGenerationOperations.FormMapping, applicationFormVersionId);
     }
 
     public async Task EnsureFormWorksheetAvailableAsync(Guid applicationFormVersionId)
     {
         var formVersion = await applicationFormVersionRepository.FindAsync(applicationFormVersionId);
-        if (formVersion == null)
-        {
-            throw new UserFriendlyException(localizer[AILocalizationKeys.FormWorksheetRequiresFormVersion]);
-        }
+        if (formVersion == null) throw new UserFriendlyException(localizer[AILocalizationKeys.FormWorksheetRequiresFormVersion]);
+        await EnsureNoActiveReviewAsync(AIGenerationOperations.FormWorksheet, applicationFormVersionId);
     }
 
     public async Task EnsureFormScoresheetAvailableAsync(Guid applicationFormVersionId)
     {
         var formVersion = await applicationFormVersionRepository.FindAsync(applicationFormVersionId);
-        if (formVersion == null)
-        {
-            throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetRequiresFormVersion]);
-        }
+        if (formVersion == null) throw new UserFriendlyException(localizer[AILocalizationKeys.FormScoresheetRequiresFormVersion]);
+        await EnsureNoActiveReviewAsync(AIGenerationOperations.FormScoresheet, applicationFormVersionId);
+    }
+
+    private async Task EnsureNoActiveReviewAsync(string operation, Guid formVersionId)
+    {
+        var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(operation, formVersionId);
+        if (review?.Status == GenerationReviewStatus.Active)
+            throw new UserFriendlyException(localizer[AILocalizationKeys.FormGenerationReviewActive]);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/ApplicationAIGenerationQueue.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/ApplicationAIGenerationQueue.cs
index c29d5df821..0a530b6dca 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/ApplicationAIGenerationQueue.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/ApplicationAIGenerationQueue.cs
@@ -180,6 +180,7 @@ await backgroundJobManager.EnqueueAsync(new AIGenerationBackgroundJobArgs
                     ApplicationFormVersionId = request.ApplicationFormVersionId,
                     AttachmentIds = request.AttachmentIds,
                     OperationId = persistedOperation.Id,
+                    GenerationRequestId = generationRequest.Id,
                     PromptVersion = request.PromptVersion,
                     RequestedByUserId = currentUser.Id,
                     TenantId = tenantId
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJob.cs
index 04d0768fb8..f05621bc90 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationBackgroundJob.cs
@@ -36,7 +36,8 @@ await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(
                 generationRequestRepository,
                 args.TenantId,
                 args.ApplicationId,
-                args.OperationId);
+                args.OperationId,
+                args.GenerationRequestId);
 
             try
             {
@@ -56,7 +57,8 @@ await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(
                     generationRequestRepository,
                     args.TenantId,
                     args.ApplicationId,
-                    args.OperationId);
+                    args.OperationId,
+                    args.GenerationRequestId);
             }
             catch (Exception ex)
             {
@@ -66,7 +68,8 @@ await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(
                     args.TenantId,
                     args.ApplicationId,
                     args.OperationId,
-                    ex.Message);
+                    ex.Message,
+                    args.GenerationRequestId);
                 throw;
             }
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationRequestJobHelper.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationRequestJobHelper.cs
index 2ab606a459..e51dea4f78 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationRequestJobHelper.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Generation/BackgroundJobs/AIGenerationRequestJobHelper.cs
@@ -78,14 +78,11 @@ public static async Task MarkRunningInNewUowAsync(
         IRepository<AIGenerationRequest, Guid> generationRequestRepository,
         Guid? tenantId,
         Guid applicationId,
-        Guid operationId)
+        Guid operationId,
+        Guid? generationRequestId = null)
     {
         using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
-        var request = await GetLatestRequestAsync(
-            generationRequestRepository,
-            x => x.TenantId == tenantId
-                 && x.ApplicationId == applicationId
-                 && x.OperationId == operationId);
+        var request = await GetRequestAsync(generationRequestRepository, generationRequestId, tenantId, applicationId, operationId);
         await MarkRunningAsync(generationRequestRepository, request);
         await uow.CompleteAsync();
     }
@@ -95,14 +92,11 @@ public static async Task MarkCompletedInNewUowAsync(
         IRepository<AIGenerationRequest, Guid> generationRequestRepository,
         Guid? tenantId,
         Guid applicationId,
-        Guid operationId)
+        Guid operationId,
+        Guid? generationRequestId = null)
     {
         using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
-        var request = await GetLatestRequestAsync(
-            generationRequestRepository,
-            x => x.TenantId == tenantId
-                 && x.ApplicationId == applicationId
-                 && x.OperationId == operationId);
+        var request = await GetRequestAsync(generationRequestRepository, generationRequestId, tenantId, applicationId, operationId);
         await MarkCompletedAsync(generationRequestRepository, request);
         await uow.CompleteAsync();
     }
@@ -113,16 +107,31 @@ public static async Task MarkFailedInNewUowAsync(
         Guid? tenantId,
         Guid applicationId,
         Guid operationId,
-        string? failureReason)
+        string? failureReason,
+        Guid? generationRequestId = null)
     {
         using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
-        var request = await GetLatestRequestAsync(
+        var request = await GetRequestAsync(generationRequestRepository, generationRequestId, tenantId, applicationId, operationId);
+        await MarkFailedAsync(generationRequestRepository, request, failureReason);
+        await uow.CompleteAsync();
+    }
+    private static async Task<AIGenerationRequest?> GetRequestAsync(
+        IRepository<AIGenerationRequest, Guid> generationRequestRepository,
+        Guid? generationRequestId,
+        Guid? tenantId,
+        Guid applicationId,
+        Guid operationId)
+    {
+        if (generationRequestId.HasValue)
+        {
+            return await generationRequestRepository.FindAsync(generationRequestId.Value);
+        }
+
+        return await GetLatestRequestAsync(
             generationRequestRepository,
             x => x.TenantId == tenantId
                  && x.ApplicationId == applicationId
                  && x.OperationId == operationId);
-        await MarkFailedAsync(generationRequestRepository, request, failureReason);
-        await uow.CompleteAsync();
     }
 
     public static async Task StampCooldownBestEffortAsync(
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormMapping/FormMappingOperationExecutor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormMapping/FormMappingOperationExecutor.cs
index 6ab7e487ca..53d2f83634 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormMapping/FormMappingOperationExecutor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormMapping/FormMappingOperationExecutor.cs
@@ -1,6 +1,9 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Linq;
+using System.Text.Json;
 using Unity.AI.Domain;
 using Unity.AI.Generation;
 using Unity.AI.Operations;
@@ -9,11 +12,11 @@
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.ApplicationForms.Mapping;
 using Unity.GrantManager.Applications;
-using Volo.Abp.Domain.Repositories;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
+using Volo.Abp.Guids;
 
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 
@@ -22,7 +25,8 @@ namespace Unity.GrantManager.GrantApplications.Automation.Operations.FormMapping
 public sealed class FormMappingOperationExecutor(
     IApplicationFormVersionMappingReadService mappingReadService,
     IFormMappingService aiService,
-    IRepository<ApplicationFormVersion, Guid> applicationFormVersionRepository) : AIGenerationOperationExecutor, ITransientDependency
+    IGenerationReviewRepository generationReviewRepository,
+    IGuidGenerator guidGenerator) : AIGenerationOperationExecutor, ITransientDependency
 {
     public override string OperationType => AIGenerationOperations.FormMapping;
 
@@ -31,17 +35,118 @@ protected override async Task<bool> ExecuteAsync(AIGenerationBackgroundJobArgs a
         var applicationFormVersionId = args.ApplicationFormVersionId
             ?? throw new InvalidOperationException("Form mapping generation requires an application form version.");
         var readModel = await mappingReadService.GetAsync(applicationFormVersionId);
+        var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+            AIGenerationOperations.FormMapping,
+            applicationFormVersionId);
+        if (review?.Status == GenerationReviewStatus.Active)
+        {
+            return false;
+        }
+
         var response = await aiService.GenerateFormMappingAsync(new FormMappingRequest
         {
             Data = FormMappingPromptDataBuilder.Build(readModel),
             PromptVersion = args.PromptVersion
         });
 
-        var submissionHeaderMapping = FormMappingResponseMapper.BuildSubmissionHeaderMapping(response);
-        var applicationFormVersion = await applicationFormVersionRepository.GetAsync(applicationFormVersionId);
-        applicationFormVersion.SubmissionHeaderMapping = submissionHeaderMapping;
-        await applicationFormVersionRepository.UpdateAsync(applicationFormVersion, true);
+        if (!string.IsNullOrWhiteSpace(response.FailureReason))
+        {
+            throw new InvalidOperationException(response.FailureReason);
+        }
+
+        if (review == null || review.Status != GenerationReviewStatus.Active)
+        {
+            var sequence = review?.Sequence + 1 ?? 1;
+            review = new GenerationReview(
+                guidGenerator.Create(),
+                AIGenerationOperations.FormMapping,
+                applicationFormVersionId,
+                sequence);
+            await generationReviewRepository.InsertAsync(review);
+        }
+
+        var rawSuggestions = FormMappingResponseMapper.ParseSuggestions(response.Mapping)
+            .Select(suggestion => new FormMappingSuggestionDto
+            {
+                Id = guidGenerator.Create(),
+                SourceField = suggestion.SourceField,
+                TargetField = suggestion.TargetField,
+                Reason = suggestion.Reason,
+                Confidence = suggestion.Confidence
+            })
+            .ToList();
+        var isFinalMapping = review.Sequence > 1 && review.Sequence % 2 == 0;
+        var unchangedCount = 0;
+        var suggestions = isFinalMapping
+            ? ClassifyFinalSuggestions(readModel.ExistingMapping, rawSuggestions, out unchangedCount)
+            : rawSuggestions;
+        var payload = JsonSerializer.Deserialize<FormMappingReviewPayload>(review.ReviewData)
+            ?? new FormMappingReviewPayload();
+        payload.PendingSuggestions = suggestions;
+        payload.UnchangedSuggestionCount = isFinalMapping ? unchangedCount : 0;
+        payload.NoSuggestionsGenerated = suggestions.Count == 0;
+        if (suggestions.Count == 0)
+        {
+            review.Complete();
+        }
+        review.SetReviewData(JsonSerializer.Serialize(payload));
+        if (suggestions.Count > 0)
+        {
+            review.SetStatus(GenerationReviewStatus.Active);
+        }
+        await generationReviewRepository.UpdateAsync(review, true);
 
         return true;
     }
+
+    internal static List<FormMappingSuggestionDto> ClassifyFinalSuggestions(
+        string? existingMapping,
+        List<FormMappingSuggestionDto> suggestions,
+        out int unchangedCount)
+    {
+        var existing = ParseMapping(existingMapping);
+        var bySource = existing.GroupBy(pair => pair.Value, StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(group => group.Key, group => group.First().Key, StringComparer.OrdinalIgnoreCase);
+        var byTarget = existing.ToDictionary(pair => pair.Key, pair => pair.Value, StringComparer.OrdinalIgnoreCase);
+        unchangedCount = 0;
+        var actionable = new List<FormMappingSuggestionDto>();
+
+        foreach (var suggestion in suggestions)
+        {
+            if (bySource.TryGetValue(suggestion.SourceField, out var previousTarget) &&
+                previousTarget.Equals(suggestion.TargetField, StringComparison.OrdinalIgnoreCase))
+            {
+                unchangedCount++;
+                continue;
+            }
+
+            suggestion.ChangeType = bySource.ContainsKey(suggestion.SourceField) ? "Changed" : "New";
+            suggestion.PreviousTargetField = bySource.GetValueOrDefault(suggestion.SourceField);
+            suggestion.ConflictSourceField = byTarget.TryGetValue(suggestion.TargetField, out var conflictSource) &&
+                !conflictSource.Equals(suggestion.SourceField, StringComparison.OrdinalIgnoreCase)
+                ? conflictSource
+                : null;
+            actionable.Add(suggestion);
+        }
+
+        return actionable;
+    }
+
+    private static Dictionary<string, string> ParseMapping(string? mapping)
+    {
+        if (string.IsNullOrWhiteSpace(mapping))
+        {
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<Dictionary<string, string>>(mapping)
+                ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+        catch (JsonException)
+        {
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormScoresheet/FormScoresheetOperationExecutor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormScoresheet/FormScoresheetOperationExecutor.cs
index 158ccd47ff..7f64eb9a4a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormScoresheet/FormScoresheetOperationExecutor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormScoresheet/FormScoresheetOperationExecutor.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Localization;
 using System;
 using System.Linq;
 using System.Text.Json;
@@ -6,16 +7,19 @@
 using Unity.AI.Domain;
 using Unity.AI.Generation;
 using Unity.AI.Operations;
+using Unity.AI.Localization;
 using Unity.AI.Requests;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
 using Unity.Flex.Domain.Scoresheets;
+using Unity.Flex.Domain.ScoresheetInstances;
 using Unity.Flex.Scoresheets;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
+using Volo.Abp.Guids;
 
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 
@@ -25,7 +29,11 @@ public sealed class FormScoresheetOperationExecutor(
     IApplicationFormVersionRepository applicationFormVersionRepository,
     IApplicationFormRepository applicationFormRepository,
     IScoresheetRepository scoresheetRepository,
-    IFormScoresheetService aiService) : AIGenerationOperationExecutor, ITransientDependency
+    IScoresheetInstanceRepository scoresheetInstanceRepository,
+    IFormScoresheetService aiService,
+    IGenerationReviewRepository generationReviewRepository,
+    IGuidGenerator guidGenerator,
+    IStringLocalizer<AIResource> localizer) : AIGenerationOperationExecutor, ITransientDependency
 {
     private static readonly JsonSerializerOptions CaseInsensitiveJsonOptions = new()
     {
@@ -37,14 +45,25 @@ public sealed class FormScoresheetOperationExecutor(
     protected override async Task<bool> ExecuteAsync(AIGenerationBackgroundJobArgs args)
     {
         var applicationFormVersionId = args.ApplicationFormVersionId
-            ?? throw new InvalidOperationException("Form scoresheet generation requires an application form version.");
+            ?? throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationRequiresFormVersion]);
         var formVersion = await applicationFormVersionRepository.GetAsync(applicationFormVersionId);
         var applicationForm = await applicationFormRepository.GetAsync(formVersion.ApplicationFormId);
         var scoresheetName = BuildScoresheetName(formVersion.Id, applicationForm.Id);
-        var existingScoresheet = await scoresheetRepository.GetByNameAsync(scoresheetName, true)
-            ?? (applicationForm.ScoresheetId.HasValue
-                ? await scoresheetRepository.GetWithChildrenAsync(applicationForm.ScoresheetId.Value)
-                : null);
+        var existingScoresheet = await scoresheetRepository.GetByNameAsync(scoresheetName, true);
+        var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+            AIGenerationOperations.FormScoresheet,
+            applicationFormVersionId);
+
+        if (review?.Status == GenerationReviewStatus.Active)
+        {
+            return false;
+        }
+
+        if (existingScoresheet is { Published: true } || existingScoresheet?.IsArchived == true
+            || existingScoresheet != null && await scoresheetInstanceRepository.AnyByScoresheetAsync(existingScoresheet.Id))
+        {
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationProtected]);
+        }
 
         var promptData = new
         {
@@ -91,11 +110,35 @@ protected override async Task<bool> ExecuteAsync(AIGenerationBackgroundJobArgs a
         });
 
         var scoresheetJson = scoresheetResponse.Scoresheet;
+        if (!string.IsNullOrWhiteSpace(scoresheetResponse.FailureReason))
+        {
+            throw new InvalidOperationException(
+                localizer[AILocalizationKeys.ScoresheetGenerationInvalidOutput, scoresheetResponse.FailureReason]);
+        }
+
         var importDto = ParseScoresheetDefinition(scoresheetJson);
+        var parsed = ParseScoresheetElement(scoresheetJson);
+        if (!HasGeneratedQuestions(parsed))
+        {
+            if (review == null || review.Status != GenerationReviewStatus.Active)
+            {
+                review = new GenerationReview(
+                    guidGenerator.Create(),
+                    AIGenerationOperations.FormScoresheet,
+                    applicationFormVersionId,
+                    review?.Sequence + 1 ?? 1);
+                await generationReviewRepository.InsertAsync(review);
+            }
+
+            review.Complete();
+            await generationReviewRepository.UpdateAsync(review, true);
+            return false;
+        }
+
         var scoresheet = existingScoresheet == null
             ? BuildScoresheet(importDto, scoresheetJson, scoresheetName)
             : RebuildScoresheet(existingScoresheet, importDto, scoresheetJson, scoresheetName);
-        scoresheet.Published = true;
+        scoresheet.Published = false;
         if (existingScoresheet == null)
         {
             await scoresheetRepository.InsertAsync(scoresheet);
@@ -105,24 +148,33 @@ protected override async Task<bool> ExecuteAsync(AIGenerationBackgroundJobArgs a
             await scoresheetRepository.UpdateAsync(scoresheet);
         }
 
-        applicationForm.ScoresheetId = scoresheet.Id;
-        await applicationFormRepository.UpdateAsync(applicationForm);
+        if (review == null || review.Status != GenerationReviewStatus.Active)
+        {
+            review = new GenerationReview(
+                guidGenerator.Create(),
+                AIGenerationOperations.FormScoresheet,
+                applicationFormVersionId,
+                review?.Sequence + 1 ?? 1);
+            await generationReviewRepository.InsertAsync(review);
+        }
+
+        await generationReviewRepository.UpdateAsync(review, true);
 
         return true;
     }
 
-    private static CreateScoresheetDto ParseScoresheetDefinition(string json)
+    private CreateScoresheetDto ParseScoresheetDefinition(string json)
     {
         if (string.IsNullOrWhiteSpace(json))
         {
-            throw new InvalidOperationException("Scoresheet generation returned empty content.");
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationEmpty]);
         }
 
         var dto = JsonSerializer.Deserialize<CreateScoresheetDto>(json, CaseInsensitiveJsonOptions);
 
         if (dto == null || string.IsNullOrWhiteSpace(dto.Title) || string.IsNullOrWhiteSpace(dto.Name))
         {
-            throw new InvalidOperationException("Scoresheet generation returned an unusable scoresheet definition.");
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationUnusable]);
         }
 
         return dto;
@@ -133,20 +185,20 @@ private static string BuildScoresheetName(Guid formVersionId, Guid formId)
         return $"ai-form-{formId}-version-{formVersionId}-scoresheet";
     }
 
-    private static Scoresheet BuildScoresheet(CreateScoresheetDto dto, string json, string scoresheetName)
+    private Scoresheet BuildScoresheet(CreateScoresheetDto dto, string json, string scoresheetName)
     {
         var scoresheet = new Scoresheet(Guid.NewGuid(), dto.Title, scoresheetName);
         var parsed = ParseScoresheetElement(json);
         if (!TryGetNumberProperty(parsed, "Version", out var version))
         {
-            throw new InvalidOperationException("Scoresheet generation returned a definition without a valid Version.");
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationNoVersion]);
         }
 
         scoresheet.Version = version;
 
-        if (!parsed.TryGetProperty("Sections", out var sectionsElement) || sectionsElement.ValueKind != JsonValueKind.Array)
+        if (!TryGetProperty(parsed, "Sections", out var sectionsElement) || sectionsElement.ValueKind != JsonValueKind.Array)
         {
-            throw new InvalidOperationException("Scoresheet generation returned a definition without Sections.");
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationNoSections]);
         }
 
         foreach (var section in sectionsElement.EnumerateArray())
@@ -156,9 +208,9 @@ private static Scoresheet BuildScoresheet(CreateScoresheetDto dto, string json,
             var scoresheetSection = new ScoresheetSection(Guid.NewGuid(), sectionName, sectionOrder);
             scoresheet.AddSection(scoresheetSection);
 
-            if (!section.TryGetProperty("Fields", out var fieldsElement) || fieldsElement.ValueKind != JsonValueKind.Array)
+            if (!TryGetProperty(section, "Fields", out var fieldsElement) || fieldsElement.ValueKind != JsonValueKind.Array)
             {
-                throw new InvalidOperationException($"Scoresheet generation returned section '{sectionName}' without Fields.");
+                throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationSectionNoFields, sectionName]);
             }
 
             foreach (var field in fieldsElement.EnumerateArray())
@@ -169,10 +221,10 @@ private static Scoresheet BuildScoresheet(CreateScoresheetDto dto, string json,
                     GetRequiredStringProperty(field, "Label", "field"),
                     (Unity.Flex.Scoresheets.Enums.QuestionType)GetRequiredNumberProperty(field, "Type", "field"),
                     GetRequiredNumberProperty(field, "Order", "field"),
-                    field.TryGetProperty("Description", out var description) && description.ValueKind != JsonValueKind.Null
+                    TryGetProperty(field, "Description", out var description) && description.ValueKind != JsonValueKind.Null
                         ? description.GetString()
                         : null,
-                    field.TryGetProperty("Definition", out var definition) && definition.ValueKind != JsonValueKind.Null
+                    TryGetProperty(field, "Definition", out var definition) && definition.ValueKind != JsonValueKind.Null
                         ? definition.GetString()
                         : null);
                 question.SectionId = scoresheetSection.Id;
@@ -188,12 +240,12 @@ private static Scoresheet BuildScoresheet(CreateScoresheetDto dto, string json,
         return scoresheet;
     }
 
-    private static Scoresheet RebuildScoresheet(Scoresheet scoresheet, CreateScoresheetDto dto, string json, string scoresheetName)
+    private Scoresheet RebuildScoresheet(Scoresheet scoresheet, CreateScoresheetDto dto, string json, string scoresheetName)
     {
         var parsed = ParseScoresheetElement(json);
         if (!TryGetNumberProperty(parsed, "Version", out var version))
         {
-            throw new InvalidOperationException("Scoresheet generation returned a definition without a valid Version.");
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationNoVersion]);
         }
 
         scoresheet.SetName(scoresheetName);
@@ -206,9 +258,9 @@ private static Scoresheet RebuildScoresheet(Scoresheet scoresheet, CreateScoresh
 
         scoresheet.Sections.Clear();
 
-        if (!parsed.TryGetProperty("Sections", out var sectionsElement) || sectionsElement.ValueKind != JsonValueKind.Array)
+        if (!TryGetProperty(parsed, "Sections", out var sectionsElement) || sectionsElement.ValueKind != JsonValueKind.Array)
         {
-            throw new InvalidOperationException("Scoresheet generation returned a definition without Sections.");
+            throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationNoSections]);
         }
 
         foreach (var section in sectionsElement.EnumerateArray())
@@ -218,9 +270,9 @@ private static Scoresheet RebuildScoresheet(Scoresheet scoresheet, CreateScoresh
             var scoresheetSection = new ScoresheetSection(Guid.NewGuid(), sectionName, sectionOrder);
             scoresheet.AddSection(scoresheetSection);
 
-            if (!section.TryGetProperty("Fields", out var fieldsElement) || fieldsElement.ValueKind != JsonValueKind.Array)
+            if (!TryGetProperty(section, "Fields", out var fieldsElement) || fieldsElement.ValueKind != JsonValueKind.Array)
             {
-                throw new InvalidOperationException($"Scoresheet generation returned section '{sectionName}' without Fields.");
+                throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationSectionNoFields, sectionName]);
             }
 
             foreach (var field in fieldsElement.EnumerateArray())
@@ -231,10 +283,10 @@ private static Scoresheet RebuildScoresheet(Scoresheet scoresheet, CreateScoresh
                     GetRequiredStringProperty(field, "Label", "field"),
                     (Unity.Flex.Scoresheets.Enums.QuestionType)GetRequiredNumberProperty(field, "Type", "field"),
                     GetRequiredNumberProperty(field, "Order", "field"),
-                    field.TryGetProperty("Description", out var description) && description.ValueKind != JsonValueKind.Null
+                    TryGetProperty(field, "Description", out var description) && description.ValueKind != JsonValueKind.Null
                         ? description.GetString()
                         : null,
-                    field.TryGetProperty("Definition", out var definition) && definition.ValueKind != JsonValueKind.Null
+                    TryGetProperty(field, "Definition", out var definition) && definition.ValueKind != JsonValueKind.Null
                         ? definition.GetString()
                         : null);
                 question.SectionId = scoresheetSection.Id;
@@ -245,6 +297,16 @@ private static Scoresheet RebuildScoresheet(Scoresheet scoresheet, CreateScoresh
         return scoresheet;
     }
 
+    private static bool HasGeneratedQuestions(JsonElement parsed)
+    {
+        return TryGetProperty(parsed, "Sections", out var sections)
+            && sections.ValueKind == JsonValueKind.Array
+            && sections.EnumerateArray().Any(section =>
+                TryGetProperty(section, "Fields", out var fields)
+                && fields.ValueKind == JsonValueKind.Array
+                && fields.GetArrayLength() > 0);
+    }
+
     private static JsonElement ParseScoresheetElement(string json)
     {
         return JsonSerializer.Deserialize<JsonElement>(json, CaseInsensitiveJsonOptions);
@@ -252,7 +314,7 @@ private static JsonElement ParseScoresheetElement(string json)
 
     private static bool TryGetNumberProperty(JsonElement element, string propertyName, out uint value)
     {
-        if (element.TryGetProperty(propertyName, out var property) && property.ValueKind == JsonValueKind.Number)
+        if (TryGetProperty(element, propertyName, out var property) && property.ValueKind == JsonValueKind.Number)
         {
             value = property.GetUInt32();
             return true;
@@ -262,25 +324,48 @@ private static bool TryGetNumberProperty(JsonElement element, string propertyNam
         return false;
     }
 
-    private static string GetRequiredStringProperty(JsonElement element, string propertyName, string sourceName, bool allowEmpty = false)
+    private string GetRequiredStringProperty(JsonElement element, string propertyName, string sourceName, bool allowEmpty = false)
     {
-        if (element.TryGetProperty(propertyName, out var property)
+        if (TryGetProperty(element, propertyName, out var property)
             && property.ValueKind == JsonValueKind.String
             && (allowEmpty || !string.IsNullOrWhiteSpace(property.GetString())))
         {
             return property.GetString()!;
         }
 
-        throw new InvalidOperationException($"Scoresheet generation returned a {sourceName} without a valid {propertyName}.");
+        throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationPropertyInvalid, sourceName, propertyName]);
+    }
+
+    private static bool TryGetProperty(JsonElement element, string propertyName, out JsonElement property)
+    {
+        if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty(propertyName, out property))
+        {
+            return true;
+        }
+
+        if (element.ValueKind == JsonValueKind.Object)
+        {
+            foreach (var candidate in element.EnumerateObject())
+            {
+                if (string.Equals(candidate.Name, propertyName, StringComparison.OrdinalIgnoreCase))
+                {
+                    property = candidate.Value;
+                    return true;
+                }
+            }
+        }
+
+        property = default;
+        return false;
     }
 
-    private static uint GetRequiredNumberProperty(JsonElement element, string propertyName, string sourceName)
+    private uint GetRequiredNumberProperty(JsonElement element, string propertyName, string sourceName)
     {
         if (TryGetNumberProperty(element, propertyName, out var value))
         {
             return value;
         }
 
-        throw new InvalidOperationException($"Scoresheet generation returned a {sourceName} without a valid {propertyName}.");
+        throw new InvalidOperationException(localizer[AILocalizationKeys.ScoresheetGenerationPropertyInvalid, sourceName, propertyName]);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormWorksheet/FormWorksheetOperationExecutor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormWorksheet/FormWorksheetOperationExecutor.cs
index a4c8987cc7..e5b3153c58 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormWorksheet/FormWorksheetOperationExecutor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/Operations/FormWorksheet/FormWorksheetOperationExecutor.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,6 +20,7 @@
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
+using Volo.Abp.Guids;
 
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 
@@ -31,6 +32,8 @@ public sealed class FormWorksheetOperationExecutor(
     IWorksheetRepository worksheetRepository,
     IApplicationFormVersionMappingReadService mappingReadService,
     IFormWorksheetService aiService,
+    IGenerationReviewRepository generationReviewRepository,
+    IGuidGenerator guidGenerator,
     ILogger<FormWorksheetOperationExecutor> logger) : AIGenerationOperationExecutor, ITransientDependency
 {
     private static readonly JsonSerializerOptions CaseInsensitiveJsonOptions = new()
@@ -46,22 +49,25 @@ protected override async Task<bool> ExecuteAsync(AIGenerationBackgroundJobArgs a
             ?? throw new InvalidOperationException("Form worksheet generation requires an application form version.");
         var formVersion = await applicationFormVersionRepository.GetAsync(applicationFormVersionId);
         var applicationForm = await applicationFormRepository.GetAsync(formVersion.ApplicationFormId);
-        var worksheetName = AiWorksheetSuggestionName.Build(applicationForm.Id, formVersion.Id);
+        var baseWorksheetName = AiWorksheetSuggestionName.Build(applicationForm.Id, formVersion.Id);
+        var review = await generationReviewRepository.FindLatestByOperationAndFormVersionAsync(
+            AIGenerationOperations.FormWorksheet,
+            applicationFormVersionId);
+        if (review?.Status == GenerationReviewStatus.Active)
+        {
+            return false;
+        }
+
+        var worksheetName = baseWorksheetName;
         var existingWorksheet = await worksheetRepository.GetByNameAsync(worksheetName, true);
+        EnsureCanonicalSuggestionWorksheetState(existingWorksheet);
+        var noSuggestionsGenerated = existingWorksheet != null &&
+            existingWorksheet.Sections.SelectMany(section => section.Fields).Any() == false;
         if (existingWorksheet != null)
         {
-            if (existingWorksheet.Published)
-            {
-                logger.LogWarning(
-                    "A published worksheet already uses AI suggestion name {WorksheetName}; leaving it unchanged.",
-                    worksheetName);
-            }
-            else
-            {
-                logger.LogInformation(
-                    "An AI suggestion worksheet is pending review for form version {FormVersionId}; leaving it unchanged.",
-                    formVersion.Id);
-            }
+            logger.LogInformation(
+                "An AI suggestion worksheet is pending review for form version {FormVersionId}; leaving it unchanged.",
+                formVersion.Id);
         }
         else
         {
@@ -95,15 +101,49 @@ protected override async Task<bool> ExecuteAsync(AIGenerationBackgroundJobArgs a
             });
 
             var suggestions = ParseWorksheetDefinition(worksheetResponse.Worksheet);
-            var worksheet = BuildWorksheet(suggestions, worksheetName);
-            worksheet.SetPublished(false);
-            await worksheetRepository.InsertAsync(worksheet);
+            noSuggestionsGenerated = suggestions.Count == 0;
+            if (!noSuggestionsGenerated)
+            {
+                var worksheet = BuildWorksheet(suggestions, worksheetName);
+                worksheet.SetPublished(false);
+                await worksheetRepository.InsertAsync(worksheet);
+            }
+
+        }
 
+        if (review == null || review.Status != GenerationReviewStatus.Active)
+        {
+            review = new GenerationReview(
+                guidGenerator.Create(),
+                AIGenerationOperations.FormWorksheet,
+                applicationFormVersionId,
+                review?.Sequence + 1 ?? 1);
+            await generationReviewRepository.InsertAsync(review);
+        }
+
+        if (noSuggestionsGenerated)
+        {
+            review.SetReviewData(JsonSerializer.Serialize(new FormWorksheetReviewPayload
+            {
+                NoSuggestionsGenerated = true
+            }));
+            review.Complete();
         }
 
+        await generationReviewRepository.UpdateAsync(review, true);
+
         return existingWorksheet == null;
     }
 
+    internal static void EnsureCanonicalSuggestionWorksheetState(Worksheet? worksheet)
+    {
+        if (worksheet?.Published == true)
+        {
+            throw new InvalidOperationException(
+                "The canonical AI suggestion worksheet is published and cannot be regenerated.");
+        }
+    }
+
     internal static List<AiWorksheetFieldSuggestion> ParseWorksheetDefinition(string json)
     {
         if (string.IsNullOrWhiteSpace(json))
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
index 0fdbe22eaf..e2aa151325 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
@@ -20,6 +20,7 @@ public class UserImportAppService : GrantManagerAppService, IUserImportAppServic
         private readonly ICurrentTenant _currentTenant;
         private readonly IdentityUserManager _userManager;
         private readonly IPersonRepository _personRepository;
+        private readonly IUserAccountsRepository _userAccountsRepository;
         private readonly IIdentityUserRepository _identityUserRepository;
         private readonly IDataFilter _dataFilter;
 
@@ -27,6 +28,7 @@ public UserImportAppService(ICssUsersApiService cssUsersApiService,
             ICurrentTenant currentTenant,
             IdentityUserManager userManager,
             IPersonRepository personRepository,
+            IUserAccountsRepository userAccountsRepository,
             IIdentityUserRepository identityUserRepository,
             IDataFilter dataFilter)
         {
@@ -34,6 +36,7 @@ public UserImportAppService(ICssUsersApiService cssUsersApiService,
             _currentTenant = currentTenant;
             _userManager = userManager;
             _personRepository = personRepository;
+            _userAccountsRepository = userAccountsRepository;
             _identityUserRepository = identityUserRepository;
             _dataFilter = dataFilter;
         }
@@ -47,15 +50,17 @@ public UserImportAppService(ICssUsersApiService cssUsersApiService,
         /// <exception cref="UserFriendlyException"></exception>
         public async Task ImportUserAsync(ImportUserDto importUserDto)
         {
-            var newUserId = Guid.NewGuid();
-
             var result = await _cssUsersApiService.FindUserAsync(importUserDto.Directory, importUserDto.Guid);
 
             if (result.Data == null || result.Data.Length == 0) throw new AbpValidationException();
 
             var cssUser = result.Data[0];
+            var oidcSub = (cssUser.Attributes?.IdirUserGuid?[0] ?? Guid.NewGuid().ToString()).ToSubjectWithoutIdp();
+            var existingPerson = await _personRepository.FindByOidcSub(oidcSub);
+            var newUserId = existingPerson?.Id ?? Guid.NewGuid();
 
-            IdentityUser? identityUser = await ReactivateAndGetDeletedUserAsync(cssUser.Attributes?.IdirUsername?[0] ?? throw new AbpValidationException());
+            IdentityUser? identityUser = await ReactivateAndGetDeletedUserAsync(
+                cssUser.Attributes?.IdirUsername?[0] ?? throw new AbpValidationException(), oidcSub, cssUser.FirstName, cssUser.LastName);
             identityUser ??= await CreateNewIdentityUserAsync(newUserId, cssUser.Attributes?.IdirUsername?[0], cssUser.FirstName, cssUser.LastName, cssUser.Email);
 
             if (identityUser == null) throw new UserFriendlyException("Error creating user account");
@@ -67,7 +72,6 @@ public async Task ImportUserAsync(ImportUserDto importUserDto)
                 await _userManager.AddToRolesAsync(identityUser, importUserDto.Roles);
             }
 
-            var oidcSub = (cssUser.Attributes?.IdirUserGuid?[0] ?? newUserId.ToString()).ToSubjectWithoutIdp();
             var displayName = cssUser.Attributes?.DisplayName?[0] ?? identityUser.NormalizedUserName.ToString();
 
             await UpdateAdditionalUserPropertiesAsync(identityUser, oidcSub, displayName);
@@ -89,9 +93,11 @@ public async Task AutoImportUserInternalAsync(ImportUserDto importUserDto,
             string oidcSub, 
             string displayName)
         {
-            var newUserId = Guid.NewGuid();                        
+            var normalizedOidcSub = oidcSub.ToSubjectWithoutIdp();
+            var existingPerson = await _personRepository.FindByOidcSub(normalizedOidcSub);
+            var newUserId = existingPerson?.Id ?? Guid.NewGuid();
 
-            IdentityUser? identityUser = await ReactivateAndGetDeletedUserAsync(username);
+            IdentityUser? identityUser = await ReactivateAndGetDeletedUserAsync(username, normalizedOidcSub, firstName, lastName);
             identityUser ??= await CreateNewIdentityUserAsync(newUserId, username, firstName, lastName, emailAddress);
 
             if (identityUser == null) throw new UserFriendlyException("Error creating user account");
@@ -103,8 +109,8 @@ public async Task AutoImportUserInternalAsync(ImportUserDto importUserDto,
                 await _userManager.AddToRolesAsync(identityUser, importUserDto.Roles);
             }
             
-            await UpdateAdditionalUserPropertiesAsync(identityUser, oidcSub, displayName);
-            await SyncUserToCurrentTenantAsync(identityUser, oidcSub, displayName);
+            await UpdateAdditionalUserPropertiesAsync(identityUser, normalizedOidcSub, displayName);
+            await SyncUserToCurrentTenantAsync(identityUser, normalizedOidcSub, displayName);
         }
 
         /// <summary>
@@ -217,7 +223,7 @@ public async Task SetUserRolesAsync(Guid userId, string[] roleNames)
             return identityUser;
         }
 
-        private async Task<IdentityUser?> ReactivateAndGetDeletedUserAsync(string username)
+        private async Task<IdentityUser?> ReactivateAndGetDeletedUserAsync(string username, string oidcSub, string? firstName, string? lastName)
         {
             //Temporary disable the ISoftDelete filter - find delete user account and reactivate for import
             using (_dataFilter.Disable<ISoftDelete>())
@@ -225,8 +231,21 @@ public async Task SetUserRolesAsync(Guid userId, string[] roleNames)
                 var identityUser = await _identityUserRepository
                     .FindByTenantIdAndUserNameAsync(username, _currentTenant.Id);
 
+                identityUser ??= (await _userAccountsRepository.GetListByOidcSub(oidcSub))
+                    .FirstOrDefault();
+
                 if (identityUser != null)
                 {
+                    // Directory details (e.g. surname) can change between imports - keep the
+                    // reactivated account's name/username current rather than leaving it stale.
+                    if (!string.IsNullOrWhiteSpace(username) &&
+                        !string.Equals(identityUser.UserName, username, StringComparison.OrdinalIgnoreCase))
+                    {
+                        await _userManager.SetUserNameAsync(identityUser, username);
+                    }
+
+                    identityUser.Name = firstName ?? identityUser.Name;
+                    identityUser.Surname = lastName ?? identityUser.Surname;
                     identityUser.IsDeleted = false;
                     identityUser.DeleterId = null;
                     identityUser.DeletionTime = null;
@@ -236,12 +255,12 @@ public async Task SetUserRolesAsync(Guid userId, string[] roleNames)
             }
 
             return null;
-        }       
+        }
 
         private async Task SyncUserToCurrentTenantAsync(IdentityUser user, string oidcSub, string displayName)
         {
-            var existingUser = await _personRepository.FindByOidcSub(oidcSub);
-            if (existingUser == null)
+            var existingPerson = await _personRepository.FindByOidcSub(oidcSub);
+            if (existingPerson == null)
             {
                 await _personRepository.InsertAsync(new Person()
                 {
@@ -251,7 +270,13 @@ await _personRepository.InsertAsync(new Person()
                     FullName = $"{user.Name} {user.Surname}",
                     Badge = Utils.CreateUserBadge(user)
                 });
+                return;
             }
+
+            existingPerson.OidcDisplayName = displayName;
+            existingPerson.FullName = $"{user.Name} {user.Surname}";
+            existingPerson.Badge = Utils.CreateUserBadge(user);
+            await _personRepository.UpdateAsync(existingPerson);
         }
 
         private async Task<IdentityUser> UpdateAdditionalUserPropertiesAsync(IdentityUser user, string oidcSub, string displayName)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/ApplicationForms/GenerationReviewStatus.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/ApplicationForms/GenerationReviewStatus.cs
new file mode 100644
index 0000000000..50ec9803c5
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/ApplicationForms/GenerationReviewStatus.cs
@@ -0,0 +1,8 @@
+namespace Unity.GrantManager.ApplicationForms;
+
+public enum GenerationReviewStatus
+{
+    Active = 0,
+    Completed = 1,
+    Discarded = 2
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/ApplicationForms/Mapping/FormMappingReviewPhase.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/ApplicationForms/Mapping/FormMappingReviewPhase.cs
new file mode 100644
index 0000000000..4b0fb7edd0
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/ApplicationForms/Mapping/FormMappingReviewPhase.cs
@@ -0,0 +1,35 @@
+namespace Unity.GrantManager.ApplicationForms.Mapping;
+
+public enum FormMappingReviewPhase
+{
+    MappingReview = 0,
+    WorksheetReview = 1,
+    PublishAndAssignWorksheets = 2,
+    FinalMappingReview = 3,
+    Completed = 4
+}
+
+public enum FormGenerationWorkflowState
+{
+    GenerateInitialMapping = 10,
+    ReviewInitialMapping = 20,
+    GenerateWorksheets = 30,
+    ReviewWorksheets = 40,
+    PublishAndAssignWorksheets = 50,
+    GenerateFinalMapping = 60,
+    ReviewFinalMapping = 70,
+    Completed = 80
+}
+
+public enum FormGenerationWorkflowAction
+{
+    GenerateInitialMapping = 10,
+    ReviewInitialMapping = 20,
+    GenerateWorksheets = 30,
+    ReviewWorksheets = 40,
+    PublishAndAssignWorksheets = 50,
+    GenerateFinalMapping = 60,
+    ReviewFinalMapping = 70,
+    GenerateMapping = 80,
+    GenerateWorksheetsNextCycle = 90
+}
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 10945ccd1a..843cb70ef7 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
@@ -616,6 +616,11 @@
     "DataTable:ContextMenu:Copy": "Copy",
     "DataTable:ContextMenu:CopiedToClipboard": "Copied to clipboard",
     "DataTable:ContextMenu:Filter": "Filter",
-    "DataTable:ContextMenu:ClearFilter": "Clear Filters"
+    "DataTable:ContextMenu:ClearFilter": "Clear Filters",
+
+    "WrongTenantError:Title": "An Error Occurred",
+    "WrongTenantError:ApplicationTenant": "This application is in Tenant: {0}",
+    "WrongTenantError:CurrentTenant": "You are currently in Tenant: {0}",
+    "WrongTenantError:Instructions": "Please click on the Profile menu at the top right of the corner, click on Switch Grant Programs, and select the correct Tenant before proceeding to view the link."
   }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/ApplicationForms/GenerationReview.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/ApplicationForms/GenerationReview.cs
new file mode 100644
index 0000000000..1bc320a738
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/ApplicationForms/GenerationReview.cs
@@ -0,0 +1,57 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.ApplicationForms;
+
+public class GenerationReview : AuditedAggregateRoot<Guid>, IMultiTenant
+{
+    protected GenerationReview()
+    {
+        ReviewData = "{}";
+    }
+
+    public GenerationReview(
+        Guid id,
+        string operation,
+        Guid contextId,
+        int sequence = 1)
+        : base(id)
+    {
+        Operation = operation;
+        ContextId = contextId;
+        Sequence = sequence;
+        Status = GenerationReviewStatus.Active;
+        ReviewData = "{}";
+    }
+
+    public string Operation { get; private set; } = null!;
+    public Guid ContextId { get; private set; }
+    public int Sequence { get; private set; }
+    public GenerationReviewStatus Status { get; private set; }
+    [Column(TypeName = "jsonb")]
+    public string ReviewData { get; private set; }
+
+    public Guid? TenantId { get; set; }
+
+    public void SetReviewData(string reviewData)
+    {
+        ReviewData = reviewData;
+    }
+
+    public void SetStatus(GenerationReviewStatus status)
+    {
+        Status = status;
+    }
+
+    public void Complete()
+    {
+        Status = GenerationReviewStatus.Completed;
+    }
+
+    public void Discard()
+    {
+        Status = GenerationReviewStatus.Discarded;
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/ApplicationForms/IGenerationReviewRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/ApplicationForms/IGenerationReviewRepository.cs
new file mode 100644
index 0000000000..1857462a0b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/ApplicationForms/IGenerationReviewRepository.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.GrantManager.ApplicationForms;
+
+public interface IGenerationReviewRepository : IRepository<GenerationReview, Guid>
+{
+    Task<GenerationReview?> FindLatestByOperationAndFormVersionAsync(
+        string operation,
+        Guid formVersionId);
+
+    Task<List<GenerationReview>> GetListByOperationAndFormVersionAsync(
+        string operation,
+        Guid formVersionId);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
index f26b4a7abb..6cd378639d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
@@ -18,6 +18,7 @@
 using Unity.Reporting.EntityFrameworkCore;
 using Unity.GrantManager.GlobalTag;
 using Unity.GrantManager.Contacts;
+using Unity.GrantManager.ApplicationForms;
 
 namespace Unity.GrantManager.EntityFrameworkCore
 {
@@ -28,6 +29,7 @@ public class GrantTenantDbContext : AbpDbContext<GrantTenantDbContext>
         public DbSet<Intake> Intakes { get; set; }
         public DbSet<ApplicationForm> ApplicationForms { get; set; }
         public DbSet<ApplicationFormVersion> ApplicationFormVersions { get; set; }
+        public DbSet<GenerationReview> GenerationReviews { get; set; }
         public DbSet<Applicant> Applicants { get; set; }
         public DbSet<Application> Applications { get; set; }
         public DbSet<ApplicationStatus> ApplicationStatuses { get; set; }
@@ -143,6 +145,16 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 b.Property(x => x.FormSchema).HasColumnType("jsonb");
             });
 
+            modelBuilder.Entity<GenerationReview>(b =>
+            {
+                b.ToTable(GrantManagerConsts.TenantTablePrefix + "GenerationReviews", "AI");
+                b.ConfigureByConvention();
+                b.Property(x => x.Operation).IsRequired();
+                b.Property(x => x.Status).HasConversion<string>().IsRequired();
+                b.Property(x => x.ReviewData).HasColumnType("jsonb").IsRequired();
+                b.HasIndex(x => new { x.Operation, x.ContextId, x.Sequence }).IsUnique();
+            });
+
             modelBuilder.Entity<ApplicationStatus>(b =>
             {
                 b.ToTable(GrantManagerConsts.TenantTablePrefix + "ApplicationStatuses",
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260805212847_AddGenerationReviews.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260805212847_AddGenerationReviews.Designer.cs
new file mode 100644
index 0000000000..830984d400
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260805212847_AddGenerationReviews.Designer.cs
@@ -0,0 +1,5340 @@
+// <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("20260805212847_AddGenerationReviews")]
+    partial class AddGenerationReviews
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.ApplicationForms.GenerationReview", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContextId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Operation")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReviewData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("Sequence")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Operation", "ContextId", "Sequence")
+                        .IsUnique();
+
+                    b.ToTable("GenerationReviews", "AI");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("FiscalYearEnd")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("date");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("ExternalStatusVisibility")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool?>("SignedOff")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid?>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("OriginTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.HasIndex("TemplateId");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("CancelledBy")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("CancelledBy");
+
+                    b.Property<Guid?>("CancelledById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CancelledById");
+
+                    b.Property<DateTime?>("CancelledOn")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CancelledOn");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", null)
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260805212847_AddGenerationReviews.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260805212847_AddGenerationReviews.cs
new file mode 100644
index 0000000000..c48a7ad854
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260805212847_AddGenerationReviews.cs
@@ -0,0 +1,53 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations;
+
+public partial class AddGenerationReviews : Migration
+{
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.EnsureSchema(
+            name: "AI");
+
+        migrationBuilder.CreateTable(
+            name: "GenerationReviews",
+            schema: "AI",
+            columns: table => new
+            {
+                Id = table.Column<Guid>(type: "uuid", nullable: false),
+                Operation = table.Column<string>(type: "text", nullable: false),
+                ContextId = table.Column<Guid>(type: "uuid", nullable: false),
+                Sequence = table.Column<int>(type: "integer", nullable: false),
+                Status = table.Column<string>(type: "text", nullable: false),
+                ReviewData = table.Column<string>(type: "jsonb", nullable: false),
+                TenantId = table.Column<Guid>(type: "uuid", nullable: true),
+                ExtraProperties = table.Column<string>(type: "text", nullable: false),
+                ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: false),
+                CreationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
+                LastModificationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                LastModifierId = table.Column<Guid>(type: "uuid", nullable: true),
+            },
+            constraints: table =>
+            {
+                table.PrimaryKey("PK_GenerationReviews", x => x.Id);
+            });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_GenerationReviews_Operation_ContextId_Sequence",
+            schema: "AI",
+            table: "GenerationReviews",
+            columns: new[] { "Operation", "ContextId", "Sequence" },
+            unique: true);
+    }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropTable(
+            name: "GenerationReviews",
+            schema: "AI");
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806201536_AB33799_HardenCheckboxGroupReportingViews.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806201536_AB33799_HardenCheckboxGroupReportingViews.Designer.cs
index 837f6ef919..3915718f85 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806201536_AB33799_HardenCheckboxGroupReportingViews.Designer.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806201536_AB33799_HardenCheckboxGroupReportingViews.Designer.cs
@@ -797,6 +797,69 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("WorksheetSections", "Flex");
                 });
 
+            modelBuilder.Entity("Unity.GrantManager.ApplicationForms.GenerationReview", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContextId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Operation")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReviewData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("Sequence")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Operation", "ContextId", "Sequence")
+                        .IsUnique();
+
+                    b.ToTable("GenerationReviews", "AI");
+                });
+
             modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
index 49f2570401..27200c2138 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -794,6 +794,68 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("WorksheetSections", "Flex");
                 });
 
+            modelBuilder.Entity("Unity.GrantManager.ApplicationForms.GenerationReview", 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<Guid>("ContextId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Operation")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReviewData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("Sequence")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Operation", "ContextId", "Sequence")
+                        .IsUnique();
+
+                    b.ToTable("GenerationReviews", "AI");
+                });
             modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/GenerationReviewRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/GenerationReviewRepository.cs
new file mode 100644
index 0000000000..c750952537
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/GenerationReviewRepository.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Unity.GrantManager.ApplicationForms;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.Repositories;
+
+[ExposeServices(typeof(IGenerationReviewRepository))]
+public class GenerationReviewRepository(
+    IDbContextProvider<GrantTenantDbContext> dbContextProvider)
+    : EfCoreRepository<GrantTenantDbContext, GenerationReview, Guid>(dbContextProvider),
+        IGenerationReviewRepository
+{
+    public async Task<GenerationReview?> FindLatestByOperationAndFormVersionAsync(
+        string operation,
+        Guid formVersionId)
+    {
+        var dbContext = await GetDbContextAsync();
+        return await dbContext.GenerationReviews
+            .Where(review =>
+                review.Operation == operation &&
+                review.ContextId == formVersionId)
+            .OrderByDescending(review => review.Sequence)
+            .FirstOrDefaultAsync();
+    }
+
+    public async Task<List<GenerationReview>> GetListByOperationAndFormVersionAsync(
+        string operation,
+        Guid formVersionId)
+    {
+        var dbContext = await GetDbContextAsync();
+        return await dbContext.GenerationReviews
+            .Where(review =>
+                review.Operation == operation &&
+                review.ContextId == formVersionId)
+            .OrderBy(review => review.Sequence)
+            .ToListAsync();
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
index bd48ebec63..c3e28bf1d6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Permissions;
+using Volo.Abp.TenantManagement;
 using Volo.Abp.Users;
 
 namespace Unity.GrantManager.Web.Pages.Applicants
@@ -14,6 +15,7 @@ public class DetailsModel : GrantManagerPageModel
     {
         private readonly IApplicantRepository _applicantRepository;
         private readonly IApplicationRepository _applicationRepository;
+        private readonly ITenantRepository _tenantRepository;
 
         [BindProperty(SupportsGet = true)]
         public Guid ApplicantId { get; set; }
@@ -21,6 +23,9 @@ public class DetailsModel : GrantManagerPageModel
         [BindProperty(SupportsGet = true)]
         public Guid? ApplicationId { get; set; } = null;
 
+        [BindProperty(SupportsGet = true)]
+        public Guid? TenantId { get; set; }
+
         public Applicant? Applicant { get; set; }
         public bool ApplicantIsDeleted { get; set; }
         public string ApplicantDisplayName { get; set; } = string.Empty;
@@ -34,11 +39,13 @@ public class DetailsModel : GrantManagerPageModel
         public DetailsModel(
             IApplicantRepository applicantRepository,
             IApplicationRepository applicationRepository,
+            ITenantRepository tenantRepository,
             ICurrentUser currentUser,
             IConfiguration configuration)
         {
             _applicantRepository = applicantRepository;
             _applicationRepository = applicationRepository;
+            _tenantRepository = tenantRepository;
             CurrentUserId = currentUser.Id;
             CurrentUserName = currentUser.SurName + ", " + currentUser.Name;
             AllowedFileTypes = configuration["S3:AllowedFileTypes"] ?? "";
@@ -47,6 +54,17 @@ public DetailsModel(
 
         public async Task<IActionResult> OnGetAsync()
         {
+            if (TenantId.HasValue && TenantId.Value != CurrentTenant.Id)
+            {
+                var applicationTenant = await _tenantRepository.FindAsync(TenantId.Value);
+                return RedirectToPage("/Error", new
+                {
+                    httpStatusCode = 409,
+                    applicationTenantName = applicationTenant?.Name ?? TenantId.Value.ToString(),
+                    currentTenantName = CurrentTenant.Name ?? "Host"
+                });
+            }
+
             // Resolve ApplicantId from ApplicationId if needed
             if (ApplicantId == Guid.Empty && ApplicationId.HasValue)
             {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/AiSuggestionReviewModalModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/AiSuggestionReviewModalModel.cs
new file mode 100644
index 0000000000..3d8b2af0a8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/AiSuggestionReviewModalModel.cs
@@ -0,0 +1,27 @@
+namespace Unity.GrantManager.Web.Pages.ApplicationForms;
+
+public sealed class AiSuggestionReviewModalModel
+{
+    public string ModalId { get; init; } = string.Empty;
+    public string ModalLabelId { get; init; } = string.Empty;
+    public string Title { get; init; } = string.Empty;
+    public string SourceColumnTitle { get; init; } = string.Empty;
+    public string TargetColumnTitle { get; init; } = string.Empty;
+    public bool HideTargetColumn { get; init; }
+    public string FieldsId { get; init; } = string.Empty;
+    public string EmptyId { get; init; } = string.Empty;
+    public string EmptyText { get; init; } = string.Empty;
+    public string EmptyTitle { get; init; } = string.Empty;
+    public string EmptyIconClass { get; init; } = "fa-wand-magic-sparkles";
+    public string SelectAllId { get; init; } = string.Empty;
+    public string? TitleInputId { get; init; }
+    public string? TitleInputLabel { get; init; }
+    public string? TitleInputPlaceholder { get; init; }
+    public bool CanMutate { get; init; } = true;
+    public string PrimaryActionId { get; init; } = string.Empty;
+    public string PrimaryActionText { get; init; } = string.Empty;
+    public bool PrimaryActionDisabled { get; init; }
+    public string ReviewLaterActionId { get; init; } = string.Empty;
+    public string DiscardActionId { get; init; } = string.Empty;
+    public string? SectionDataAttribute { get; init; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index e18fef4833..2d9e883c5c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -1,309 +1,454 @@
-@page
-@using Unity.GrantManager.ApplicationForms
-@using Unity.Reporting.Permissions
-@using Volo.Abp.AspNetCore.Mvc.UI.Layout;
-@using Unity.GrantManager.Web.Pages.ApplicationForms;
-@using Unity.GrantManager.Permissions;
-@using Unity.Notifications.Permissions;
-@using Unity.AI.Permissions;
-
-@using Volo.Abp.Authorization.Permissions;
-@using Unity.GrantManager.Web.Views.Shared.Components.Notifications;
-@using Unity.GrantManager.Web.Views.Shared.Components.ApplicationFormConfigWidget;
-@using Volo.Abp.Features
-
-@model MappingModel
-@inject IPageLayout PageLayout
-@inject IPermissionChecker PermissionChecker
-@inject IFeatureChecker FeatureChecker
-
-@{
-    PageLayout.Content.MenuItemName = "GrantManager.ApplicationForms";
-    PageLayout.Content.Title = "Application Mapping";
-    ViewBag.PageTitle = "Application Forms Mapping";
-}
-@section scripts
-{
-    <abp-script src="/Views/Shared/Components/_Shared/string-utils.js" />
-    <abp-script src="/Pages/ApplicationForms/mapping-utils.js" />
-    <abp-script src="/Pages/GrantApplications/ai-generation-button-state.js" />
-    <abp-script src="/Pages/GrantApplications/ai-rate-limit.js" />
-    <abp-script src="/Pages/ApplicationForms/Mapping.js" />
-    <abp-script src="/Pages/SettingManagement/zone-management.js" />
-}
-
-@section styles {
-    <abp-style src="/Pages/ApplicationForms/Mapping.css" />
-}
-
-<input type="hidden" id="intakeProperties" value="@Model.IntakeProperties" />
-<input type="hidden" id="applicationFormVersionDtoString" value="@Model.ApplicationFormVersionDtoString" />
-<input type="hidden" id="availableChefsFields" value="@Model.ApplicationFormVersionDto?.AvailableChefsFields" />
-<input type="hidden" id="existingMapping" value="@Model.ApplicationFormVersionDto?.SubmissionHeaderMapping" />
-<input type="hidden" id="formVersionId" value="@Model.ApplicationFormVersionDto?.Id" />
-<input type="hidden" id="applicationFormId" value="@Model.ApplicationFormDto?.Id" />
-<input type="hidden" id="chefsFormId" value="@Model.ApplicationFormDto?.ChefsApplicationFormGuid" />
-<input type="hidden" id="formName" value="@Model.ApplicationFormDto?.ApplicationFormName" />
-
-<div class="container-fluid">
-    <div class="row">
-        <div class="col-12">
-            <h5 class="label unt-label" id="applicationFormName">@Model.ApplicationFormDto?.ApplicationFormName</h5>
-        </div>
-    </div>
-    <!--Tab list -->
-    <nav aria-label="Application form configuration tabs">
-        <div class="nav nav-tabs" id="nav-tab" role="tablist">
-            <button class="nav-link active" id="nav-mapping-tab" data-bs-toggle="tab" data-bs-target="#nav-mapping" type="button" role="tab">
-                Mapping
-            </button>
-            <button class="nav-link" id="nav-custom-fields-tab" data-bs-toggle="tab" data-bs-target="#nav-custom-fields" type="button" role="tab">
-                Scoresheet & Worksheets
-            </button>
-            @if (await PermissionChecker.IsGrantedAsync(UnitySettingManagementPermissions.UserInterface))
-            {
-                <button class="nav-link" id="nav-ui-configuration-tab" data-bs-toggle="tab" data-bs-target="#nav-ui-configuration" type="button" role="tab">
-                    User Interface
-                </button>
-            }
-            @if (await FeatureChecker.IsEnabledAsync("Unity.Payments"))
-            {
-                <button class="nav-link" id="nav-payment-configuration-tab" data-bs-toggle="tab" data-bs-target="#nav-payment-configuration" type="button" role="tab">
-                    Payment
-                </button>
-            }
-            @if (await FeatureChecker.IsEnabledAsync("Unity.Reporting")
-                        && await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Default))
-            {
-                <button class="nav-link" id="nav-reporting-configuration-tab" data-bs-toggle="tab"
-                    data-bs-target="#nav-reporting-configuration" type="button" role="tab">Reporting Configuration</button>
-            }
-            <button class="nav-link" id="nav-other-configuration-tab" data-bs-toggle="tab"
-                data-bs-target="#nav-other-configuration" type="button" role="tab">Other Configuration</button>
-                
-            @if (await PermissionChecker.IsGrantedAsync(NotificationsPermissions.Email.NotificationsTab))
-            {    
-            <button class="nav-link" id="nav-notifications-tab" data-bs-toggle="tab" data-bs-target="#nav-notifications" type="button" role="tab">Notifications</button>
-            }
-            @if (Model?.ShowAITab == true)
-            {
-                <button class="nav-link" id="nav-ai-configuration-tab" data-bs-toggle="tab"
-                    data-bs-target="#nav-ai-configuration" type="button" role="tab">AI</button>
-            }
-        </div>
-    </nav>
-    <div class="tab-content unt-tab-content" id="nav-tabContent">
-        <!--Tab Content: Mapping-->
-        <div id="nav-mapping" class="tab-pane fade show active container-fluid" role="tabpanel" aria-labelledby="nav-mapping-tab">
-            <input type="hidden" id="refresh_available_worksheets" value="" />
-            <div class="configuration-action-bar row">
-                <div class="col-12 col-md-8">
-                    <h5>Mapping Configuration</h5>
-                </div>
-                <div class="col-12 col-md-4 btn-wrapper">
-                    <abp-button id="btn-save" text="Save" icon-type="Other" icon="fl fl-save"
-                                class="btn unt-btn-primary btn-primary"
-                                style="pointer-events: all;"
-                                abp-tooltip="Save the Scoresheet and the Mapping of Unity fields to CHEFS Fields"
-                                button-type="Primary" />
-                    <abp-button id="btn-edit" text="Edit Mapping" icon-type="Other" data-target="#editMappingModal"
-                                icon="fl fl-edit" class="btn unt-btn-primary btn-primary" data-toggle="modal"
-                                style="pointer-events: all;" abp-tooltip="Edit the Mapping JSON Manually"
-                                button-type="Primary" />
-                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.Generate))
-                    {
-                        <button type="button" id="btn-generate" class="btn ai-generate-btn unt-btn-outline-primary btn-outline-primary"
-                                data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" disabled
-                                title="Generate the mapping for the current form version">
-                            <span class="ai-button-content">
-                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
-                                <span>Generate Mapping</span>
-                            </span>
-                        </button>
-                    }
-                    <abp-button id="btn-reset" text="Reset Mapping" icon-type="Other" icon="fl fl-undo"
-                                class="btn unt-btn-outline-primary btn-outline-primary"
-                                abp-tooltip="This button resets the mapping to the last saved state" />
-                    <abp-button id="btn-back" text="Back"
-                                class="btn unt-btn-outline-primary btn-outline-primary"
-                                abp-tooltip="Navigate back to the Forms" />
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6 p-3">
-                    <label for="applicationFormVersion" class="form-label">Version:</label>
-                    <div class="select-icon-wrapper">
-                        <select class="form-select form-control" id="applicationFormVersion" name="Version">
-                            @foreach (var applicationFormVersionDto in Model?.ApplicationFormVersionDtoList ?? new
-                                                        List<ApplicationFormVersionDto>
-                            { })
-                            {
-                                @if (@applicationFormVersionDto.ChefsFormVersionGuid + "" != "")
-                                {
-                                    var selected = false;
-                                    @if (Model?.ChefsFormVersionGuid + "" == applicationFormVersionDto.ChefsFormVersionGuid)
-                                    {
-                                        selected = true;
-                                    }
-
-                                    <option value="@applicationFormVersionDto.ChefsFormVersionGuid" selected="@(selected)">
-                                        @applicationFormVersionDto.Version - @applicationFormVersionDto.ChefsFormVersionGuid
-                                    </option>
-                                }
-                            }
-                        </select>
-                        @if (Model?.ApplicationFormVersionDto?.Published == true)
-                        {
-                            <i class="fl fl-tick published-tick" data-toggle="tooltip" title="This form is published"></i>
-                        }
-                    </div>
-                </div>
-                <div class="col-6 p-3">
-                    <label for="chefsFormVersionId" class="form-label">Form Version ID:</label>
-                    <div class="input-button-wrapper ">
-                        <input id="chefsFormVersionId" class="form-control input-width" type="text"
-                            value="@Model?.ChefsFormVersionGuid">
-                        <abp-button id="btn-sync" text="Sync" disabled="false" icon-type="Other" icon="fl fl-synch"
-                            class="btn unt-btn-success btn-success"
-                            abp-tooltip="Call out to CHEFS and bring back all the Available CHEFS form Fields. This action requires a Form Version ID to be entered"
-                            button-type="Success" />
-                    </div>
-                </div>
-            </div>
-            <div class="unt-mapping-container">
-                <div class="row">
-                    <div class="col-8">
-                        <div class="label table-title">Chefs Fields</div>
-                    </div>
-                    <div class="col-4">
-                        <!--Tab list 2-->
-                        <nav aria-label="Field mapping tabs">
-                            <div class="nav nav-tabs" role="tablist">
-                                <button class="nav-link active" id="nav-intake-fields-tab" data-bs-toggle="tab"
-                                    data-bs-target="#nav-intake-fields" type="button" role="tab">Core Fields</button>
-                                <button class="nav-link" id="nav-worksheet-fields-tab" data-bs-toggle="tab"
-                                    data-bs-target="#nav-worksheet-fields" type="button" role="tab">Custom
-                                    Fields</button>
-                            </div>
-                        </nav>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-8">
-                        <div class="application-forms-table-content">
-                            <abp-table id="ApplicationFormsTable" class="chef-field-table table table-striped">
-                                <thead>
-                                    <tr>
-                                        <th scope="Column">CHEFS Label</th>
-                                        <th scope="Column">CHEFS Property Name</th>
-                                        <th scope="Column">CHEFS Type</th>
-                                        <th scope="Column">Map To Unity</th>
-                                    </tr>
-                                </thead>
-                            </abp-table>
-                        </div>
-                    </div>
-                    <div class="col-4">
-                        <div class="tab-content unt-tab-content" id="nav-tabContent-2">
-                            <!--Tab Content: Mapping-->
-                            <div class="tab-pane fade show active" id="nav-intake-fields" role="tabpanel"
-                                aria-labelledby="nav-intake-fields-tab">
-
-                                <div class="intake-mapping-content">
-                                    <div id="intake-map-available-fields-column" class="col" style="overflow-y:scroll">
-                                    </div>
-                                </div>
-                            </div>
-                            <!--Tab Content: Worksheet Fields-->
-                            <div class="tab-pane fade" id="nav-worksheet-fields" role="tabpanel"
-                                aria-labelledby="nav-worksheet-fields-tab">
-                                <div class="worksheet-mapping-content">
-                                    <div id="worksheet-map-available-fields-column" class="col"
-                                        style="overflow-y:scroll">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!--Tab Content: Worksheets-->
-        @if (Model?.FlexEnabled == true)
-        {
-            <div id="nav-custom-fields" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-custom-fields-tab">
-                <div id="customFieldsWidget">
-                    @await Component.InvokeAsync("CustomFields", 
-                        new {   formVersionId = Model?.ApplicationFormVersionDto?.ChefsFormVersionGuid?.ToString(), 
-                                formName = Model?.ApplicationFormDto?.ApplicationFormName 
-                            }
-                    )
-                </div>
-            </div>
-        }
-
-        <!--Tab Content: UI Configuration loaded by initializeUIConfiguration-->
-        <div class="tab-pane fade" id="nav-ui-configuration" role="tabpanel" aria-labelledby="nav-ui-configuration-tab"></div>
-
-        @if (await FeatureChecker.IsEnabledAsync("Unity.Payments"))
-        {
-        <!--Tab Content: Payment Configuration-->
-        <div id="nav-payment-configuration" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-payment-configuration-tab">
-            <div id="paymentConfigurationWidget">
-                @await Component.InvokeAsync("PaymentConfiguration", new { formid = @Model?.ApplicationFormDto?.Id})
-            </div>
-        </div>
-        }
-
-        @if (await FeatureChecker.IsEnabledAsync("Unity.Reporting")
-                && await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Default))
-        {
-            <!--Tab Content: Reporting Configuration-->
-            <div class="tab-pane fade" 
-                 id="nav-reporting-configuration" 
-                 role="tabpanel" 
-                 aria-labelledby="nav-reporting-configuration-tab">
-                @await Component.InvokeAsync("ReportingConfiguration", new { formid = @Model?.ApplicationFormDto?.Id })
-            </div>
-        }
-
-        <!--Tab Content: Other Configuration-->
-        <div class="tab-pane fade" id="nav-other-configuration" role="tabpanel"
-            aria-labelledby="nav-other-configuration-tab">
-            @await Component.InvokeAsync(typeof(ApplicationFormConfigWidget), new { configType = "Other",
-            applicationForm = Model?.ApplicationFormDto })
-        </div>
-
-
-        <!--Tab Content: Notifications -->
-         @if (await FeatureChecker.IsEnabledAsync("Unity.Notifications")) {
-        <div class="tab-pane fade" id="nav-notifications" role="tabpanel"
-            aria-labelledby="nav-notifications-tab">
-            @await Component.InvokeAsync(typeof(Notifications), new { formid = Model?.ApplicationFormDto?.Id.ToString() })
-        </div>
-        }
-
-        @if (Model?.ShowAITab == true)
-        {
-            <!--Tab Content: AI Configuration-->
-            <div id="nav-ai-configuration" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
-                @await Component.InvokeAsync("AIConfiguration", new { formId = Model?.ApplicationFormDto?.Id })
-            </div>
-        }
-    </div>
-
-    <abp-modal centered="true" scrollable="true" size="Large" id="editMappingModal">
-            <abp-modal-header title="Edit Mapping JSON"></abp-modal-header>
-        <abp-modal-body>
-            <textarea id="jsonText" rows="15"
-                cols="80" aria-label="Mapping JSON">@Model?.ApplicationFormVersionDto?.SubmissionHeaderMapping</textarea>
-        </abp-modal-body>
-        <abp-modal-footer>
-            <abp-button id="btn-save-mapping" text="Save Mapping JSON" icon-type="Other"
-                class="btn unt-btn-primary btn-primary" abp-tooltip="Save the Mapping JSON" button-type="Primary" />
-            <abp-button id="btn-cancel-mapping" text="Cancel" icon-type="Other" class="btn unt-btn-link btn-link"
-                abp-tooltip="Cancel the Edit" button-type="Secondary" />
-        </abp-modal-footer>
-    </abp-modal>
-</div>
+@page
+@using Unity.GrantManager.ApplicationForms
+@using Unity.Reporting.Permissions
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout;
+@using Unity.GrantManager.Web.Pages.ApplicationForms;
+@using Unity.GrantManager.Permissions;
+@using Unity.Notifications.Permissions;
+@using Unity.AI.Permissions;
+
+@using Volo.Abp.Authorization.Permissions;
+@using Unity.GrantManager.Web.Views.Shared.Components.Notifications;
+@using Unity.GrantManager.Web.Views.Shared.Components.ApplicationFormConfigWidget;
+@using Volo.Abp.Features
+
+@model MappingModel
+@inject IPageLayout PageLayout
+@inject IPermissionChecker PermissionChecker
+@inject IFeatureChecker FeatureChecker
+
+@{
+    PageLayout.Content.MenuItemName = "GrantManager.ApplicationForms";
+    PageLayout.Content.Title = "Application Mapping";
+    ViewBag.PageTitle = "Application Forms Mapping";
+    var mappingReviewModal = new AiSuggestionReviewModalModel
+    {
+        ModalId = "aiMappingReviewModal",
+        ModalLabelId = "aiMappingReviewModalLabel",
+        CanMutate = await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.Generate),
+        Title = "Review AI Mapping Suggestions",
+        SourceColumnTitle = "CHEFS Field",
+        TargetColumnTitle = "Unity Core Field",
+        FieldsId = "aiMappingReviewFields",
+        EmptyId = "aiMappingReviewEmpty",
+        EmptyTitle = "No mapping changes found",
+        EmptyText = "AI completed its review but did not find any new mappings that need attention. Existing mappings were left unchanged.",
+        SelectAllId = "aiMappingReviewSelectAll",
+        PrimaryActionId = "btn-add-ai-mapping",
+        PrimaryActionText = "Add selected to map",
+        ReviewLaterActionId = "btn-review-later-ai-mapping",
+        DiscardActionId = "btn-discard-ai-mapping"
+    };
+    var worksheetReviewModal = new AiSuggestionReviewModalModel
+    {
+        ModalId = "aiWorksheetReviewModal",
+        ModalLabelId = "aiWorksheetReviewModalLabel",
+        CanMutate = await PermissionChecker.IsGrantedAsync(AIPermissions.FormWorksheet.Generate),
+        Title = "Create Worksheet Draft",
+        SourceColumnTitle = "Source Field",
+        TargetColumnTitle = "Worksheet Field",
+        FieldsId = "aiWorksheetReviewFields",
+        EmptyId = "aiWorksheetReviewEmpty",
+        EmptyTitle = "No worksheet fields found",
+        EmptyText = "AI completed its review but did not find any additional worksheet fields that need to be created.",
+        SelectAllId = "aiWorksheetReviewSelectAll",
+        TitleInputId = "aiWorksheetTitle",
+        TitleInputLabel = "Worksheet Title",
+        TitleInputPlaceholder = "e.g., Project details",
+        PrimaryActionId = "btn-create-ai-worksheet-draft",
+        PrimaryActionText = "Create Draft",
+        PrimaryActionDisabled = true,
+        ReviewLaterActionId = "btn-review-later-ai-worksheet",
+        DiscardActionId = "btn-discard-ai-worksheet"
+    };
+    var scoresheetReviewModal = new AiSuggestionReviewModalModel
+    {
+        ModalId = "aiScoresheetReviewModal",
+        ModalLabelId = "aiScoresheetReviewModalLabel",
+        CanMutate = await PermissionChecker.IsGrantedAsync(AIPermissions.FormScoresheet.Generate),
+        Title = "Review AI Scoresheet Suggestions",
+        SourceColumnTitle = "Generated Question",
+        TargetColumnTitle = "Section",
+        FieldsId = "aiScoresheetReviewFields",
+        EmptyId = "aiScoresheetReviewEmpty",
+        EmptyTitle = "No scoresheet questions found",
+        EmptyText = "AI completed its review but did not find any additional scoresheet questions that need to be added.",
+        SelectAllId = "aiScoresheetReviewSelectAll",
+        TitleInputId = "aiScoresheetTitle",
+        TitleInputLabel = "Scoresheet Title",
+        TitleInputPlaceholder = "e.g., Application Assessment",
+        PrimaryActionId = "btn-create-ai-scoresheet-draft",
+        PrimaryActionText = "Add to Scoresheet",
+        PrimaryActionDisabled = true,
+        ReviewLaterActionId = "btn-review-later-ai-scoresheet",
+        DiscardActionId = "btn-discard-ai-scoresheet",
+        HideTargetColumn = true,
+        SectionDataAttribute = "section-id"
+    };
+}
+@section scripts
+{
+    <abp-script src="/Views/Shared/Components/_Shared/string-utils.js" />
+    <abp-script src="/Pages/ApplicationForms/mapping-utils.js" />
+    <abp-script src="/Pages/GrantApplications/ai-generation-button-state.js" />
+    <abp-script src="/Pages/GrantApplications/ai-rate-limit.js" />
+    <abp-script src="/Pages/ApplicationForms/Mapping.js" />
+    <abp-script src="/Pages/SettingManagement/zone-management.js" />
+}
+
+@section styles {
+    <abp-style src="/Pages/GrantApplications/ai-generation-button.css" />
+    <abp-style src="/Pages/ApplicationForms/Mapping.css" />
+    <abp-style src="/Views/Shared/Components/CustomFields/Default.css" />
+}
+
+<input type="hidden" id="intakeProperties" value="@Model.IntakeProperties" />
+<input type="hidden" id="applicationFormVersionDtoString" value="@Model.ApplicationFormVersionDtoString" />
+<input type="hidden" id="availableChefsFields" value="@Model.ApplicationFormVersionDto?.AvailableChefsFields" />
+<input type="hidden" id="existingMapping" value="@Model.ApplicationFormVersionDto?.SubmissionHeaderMapping" />
+<input type="hidden" id="formVersionId" value="@Model.ApplicationFormVersionDto?.Id" />
+<input type="hidden" id="applicationFormId" value="@Model.ApplicationFormDto?.Id" />
+<input type="hidden" id="chefsFormId" value="@Model.ApplicationFormDto?.ChefsApplicationFormGuid" />
+<input type="hidden" id="formName" value="@Model.ApplicationFormDto?.ApplicationFormName" />
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-12">
+            <h5 class="label unt-label" id="applicationFormName">@Model.ApplicationFormDto?.ApplicationFormName</h5>
+        </div>
+    </div>
+    <!--Tab list -->
+    <nav aria-label="Application form configuration tabs">
+        <div class="nav nav-tabs" id="nav-tab" role="tablist">
+            <button class="nav-link active" id="nav-mapping-tab" data-bs-toggle="tab" data-bs-target="#nav-mapping" type="button" role="tab">
+                Mapping
+            </button>
+            <button class="nav-link" id="nav-custom-fields-tab" data-bs-toggle="tab" data-bs-target="#nav-custom-fields" type="button" role="tab">
+                Scoresheet & Worksheets
+            </button>
+            @if (await PermissionChecker.IsGrantedAsync(UnitySettingManagementPermissions.UserInterface))
+            {
+                <button class="nav-link" id="nav-ui-configuration-tab" data-bs-toggle="tab" data-bs-target="#nav-ui-configuration" type="button" role="tab">
+                    User Interface
+                </button>
+            }
+            @if (await FeatureChecker.IsEnabledAsync("Unity.Payments"))
+            {
+                <button class="nav-link" id="nav-payment-configuration-tab" data-bs-toggle="tab" data-bs-target="#nav-payment-configuration" type="button" role="tab">
+                    Payment
+                </button>
+            }
+            @if (await FeatureChecker.IsEnabledAsync("Unity.Reporting")
+                        && await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Default))
+            {
+                <button class="nav-link" id="nav-reporting-configuration-tab" data-bs-toggle="tab"
+                    data-bs-target="#nav-reporting-configuration" type="button" role="tab">Reporting Configuration</button>
+            }
+            <button class="nav-link" id="nav-other-configuration-tab" data-bs-toggle="tab"
+                data-bs-target="#nav-other-configuration" type="button" role="tab">Other Configuration</button>
+
+            @if (await PermissionChecker.IsGrantedAsync(NotificationsPermissions.Email.NotificationsTab))
+            {
+            <button class="nav-link" id="nav-notifications-tab" data-bs-toggle="tab" data-bs-target="#nav-notifications" type="button" role="tab">Notifications</button>
+            }
+            @if (Model?.ShowAITab == true)
+            {
+                <button class="nav-link" id="nav-ai-configuration-tab" data-bs-toggle="tab"
+                    data-bs-target="#nav-ai-configuration" type="button" role="tab">AI</button>
+            }
+        </div>
+    </nav>
+    <div class="tab-content unt-tab-content" id="nav-tabContent">
+        <!--Tab Content: Mapping-->
+        <div id="nav-mapping" class="tab-pane fade show active container-fluid" role="tabpanel" aria-labelledby="nav-mapping-tab">
+            <input type="hidden" id="refresh_available_worksheets" value="" />
+            <div class="configuration-action-bar row">
+                <div class="col-12 col-md-8">
+                    <h5>Mapping Configuration</h5>
+                </div>
+                <div class="col-12 col-md-4 btn-wrapper" data-ai-workflow-loading="true">
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.Generate))
+                    {
+                        <button type="button" id="btn-generate" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" disabled
+                                title="Generate the mapping for the current form version">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Generate Initial Mapping</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.View))
+                    {
+                        <button type="button" id="btn-review-mapping" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                data-ai-review-action="true"
+                                title="Review pending mapping suggestions">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Review Initial Mapping</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormWorksheet.Generate))
+                    {
+                        <button type="button" id="btn-generate-worksheet" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" data-ai-pending="false" disabled
+                                title="Generate worksheet suggestions for the current form version">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Generate Worksheets</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormWorksheet.View))
+                        {
+                            <button type="button" id="btn-review-worksheet" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                data-ai-review-action="true"
+                                title="Review pending worksheet suggestions">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Review Worksheets</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormWorksheet.Generate))
+                    {
+                        <button type="button" id="btn-publish-assign-worksheets" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none" disabled
+                                title="Publish and assign worksheet drafts before generating the final mapping">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-link"></i>
+                                <span>Publish &amp; Assign Worksheets</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.Generate))
+                    {
+                        <button type="button" id="btn-generate-final-mapping" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                title="Generate the final mapping for the current form version">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Generate Final Mapping</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.View))
+                        {
+                            <button type="button" id="btn-review-final-mapping" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                data-ai-review-action="true"
+                                title="Review final mapping suggestions">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Review Final Mapping</span>
+                            </span>
+                        </button>
+                    }
+                    @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormMapping.Generate)
+                        && await PermissionChecker.IsGrantedAsync(AIPermissions.FormWorksheet.Generate))
+                    {
+                        <button type="button" id="btn-restart-ai-flow" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn ai-workflow-action d-none"
+                                data-ai-review-action="true"
+                                title="Delete AI workflow progress, AI worksheets, and saved mappings for this form version">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
+                                <span>Restart AI Flow</span>
+                            </span>
+                        </button>
+                    }
+                    <abp-button id="btn-save" text="Save" icon-type="Other" icon="fl fl-save"
+                                class="btn unt-btn-primary btn-primary"
+                                style="pointer-events: all;"
+                                abp-tooltip="Save the Scoresheet and the Mapping of Unity fields to CHEFS Fields"
+                                button-type="Primary" />
+                    <abp-button id="btn-edit" text="Edit Mapping" icon-type="Other" data-target="#editMappingModal"
+                                icon="fl fl-edit" class="btn unt-btn-primary btn-primary" data-toggle="modal"
+                                style="pointer-events: all;" abp-tooltip="Edit the Mapping JSON Manually"
+                                button-type="Primary" />
+                    <abp-button id="btn-reset" text="Reset Mapping" icon-type="Other" icon="fl fl-undo"
+                                class="btn unt-btn-outline-primary btn-outline-primary"
+                                abp-tooltip="This button resets the mapping to the last saved state" />
+                    <abp-button id="btn-back" text="Back"
+                                class="btn unt-btn-outline-primary btn-outline-primary"
+                                abp-tooltip="Navigate back to the Forms" />
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-6 p-3">
+                    <label for="applicationFormVersion" class="form-label">Version:</label>
+                    <div class="select-icon-wrapper">
+                        <select class="form-select form-control" id="applicationFormVersion" name="Version">
+                            @foreach (var applicationFormVersionDto in Model?.ApplicationFormVersionDtoList ?? new
+                                                        List<ApplicationFormVersionDto>
+                            { })
+                            {
+                                @if (@applicationFormVersionDto.ChefsFormVersionGuid + "" != "")
+                                {
+                                    var selected = false;
+                                    @if (Model?.ChefsFormVersionGuid + "" == applicationFormVersionDto.ChefsFormVersionGuid)
+                                    {
+                                        selected = true;
+                                    }
+
+                                    <option value="@applicationFormVersionDto.ChefsFormVersionGuid" selected="@(selected)">
+                                        @applicationFormVersionDto.Version - @applicationFormVersionDto.ChefsFormVersionGuid
+                                    </option>
+                                }
+                            }
+                        </select>
+                        @if (Model?.ApplicationFormVersionDto?.Published == true)
+                        {
+                            <i class="fl fl-tick published-tick" data-toggle="tooltip" title="This form is published"></i>
+                        }
+                    </div>
+                </div>
+                <div class="col-6 p-3">
+                    <label for="chefsFormVersionId" class="form-label">Form Version ID:</label>
+                    <div class="input-button-wrapper ">
+                        <input id="chefsFormVersionId" class="form-control input-width" type="text"
+                            value="@Model?.ChefsFormVersionGuid">
+                        <abp-button id="btn-sync" text="Sync" disabled="false" icon-type="Other" icon="fl fl-synch"
+                            class="btn unt-btn-success btn-success"
+                            abp-tooltip="Call out to CHEFS and bring back all the Available CHEFS form Fields. This action requires a Form Version ID to be entered"
+                            button-type="Success" />
+                    </div>
+                </div>
+            </div>
+            <div class="unt-mapping-container">
+                <div class="row">
+                    <div class="col-8">
+                        <div class="label table-title">Chefs Fields</div>
+                    </div>
+                    <div class="col-4">
+                        <!--Tab list 2-->
+                        <nav aria-label="Field mapping tabs">
+                            <div class="nav nav-tabs" role="tablist">
+                                <button class="nav-link active" id="nav-intake-fields-tab" data-bs-toggle="tab"
+                                    data-bs-target="#nav-intake-fields" type="button" role="tab">Core Fields</button>
+                                <button class="nav-link" id="nav-worksheet-fields-tab" data-bs-toggle="tab"
+                                    data-bs-target="#nav-worksheet-fields" type="button" role="tab">Custom
+                                    Fields</button>
+                            </div>
+                        </nav>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-8">
+                        <div class="application-forms-table-content">
+                            <abp-table id="ApplicationFormsTable" class="chef-field-table table table-striped">
+                                <thead>
+                                    <tr>
+                                        <th scope="Column">CHEFS Label</th>
+                                        <th scope="Column">CHEFS Property Name</th>
+                                        <th scope="Column">CHEFS Type</th>
+                                        <th scope="Column">Map To Unity</th>
+                                    </tr>
+                                </thead>
+                            </abp-table>
+                        </div>
+                    </div>
+                    <div class="col-4">
+                        <div class="tab-content unt-tab-content" id="nav-tabContent-2">
+                            <!--Tab Content: Mapping-->
+                            <div class="tab-pane fade show active" id="nav-intake-fields" role="tabpanel"
+                                aria-labelledby="nav-intake-fields-tab">
+
+                                <div class="intake-mapping-content">
+                                    <div id="intake-map-available-fields-column" class="col" style="overflow-y:scroll">
+                                    </div>
+                                </div>
+                            </div>
+                            <!--Tab Content: Worksheet Fields-->
+                            <div class="tab-pane fade" id="nav-worksheet-fields" role="tabpanel"
+                                aria-labelledby="nav-worksheet-fields-tab">
+                                <div class="worksheet-mapping-content">
+                                    <div id="worksheet-map-available-fields-column" class="col"
+                                        style="overflow-y:scroll">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!--Tab Content: Worksheets-->
+        @if (Model?.FlexEnabled == true)
+        {
+            <div id="nav-custom-fields" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-custom-fields-tab">
+                <div id="customFieldsWidget">
+                    @await Component.InvokeAsync("CustomFields",
+                        new {   formVersionId = Model?.ApplicationFormVersionDto?.ChefsFormVersionGuid?.ToString(),
+                                formName = Model?.ApplicationFormDto?.ApplicationFormName
+                            }
+                    )
+                </div>
+            </div>
+        }
+
+        <!--Tab Content: UI Configuration loaded by initializeUIConfiguration-->
+        <div class="tab-pane fade" id="nav-ui-configuration" role="tabpanel" aria-labelledby="nav-ui-configuration-tab"></div>
+
+        @if (await FeatureChecker.IsEnabledAsync("Unity.Payments"))
+        {
+        <!--Tab Content: Payment Configuration-->
+        <div id="nav-payment-configuration" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-payment-configuration-tab">
+            <div id="paymentConfigurationWidget">
+                @await Component.InvokeAsync("PaymentConfiguration", new { formid = @Model?.ApplicationFormDto?.Id})
+            </div>
+        </div>
+        }
+
+        @if (await FeatureChecker.IsEnabledAsync("Unity.Reporting")
+                && await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Default))
+        {
+            <!--Tab Content: Reporting Configuration-->
+            <div class="tab-pane fade"
+                 id="nav-reporting-configuration"
+                 role="tabpanel"
+                 aria-labelledby="nav-reporting-configuration-tab">
+                @await Component.InvokeAsync("ReportingConfiguration", new { formid = @Model?.ApplicationFormDto?.Id })
+            </div>
+        }
+
+        <!--Tab Content: Other Configuration-->
+        <div class="tab-pane fade" id="nav-other-configuration" role="tabpanel"
+            aria-labelledby="nav-other-configuration-tab">
+            @await Component.InvokeAsync(typeof(ApplicationFormConfigWidget), new { configType = "Other",
+            applicationForm = Model?.ApplicationFormDto })
+        </div>
+
+
+        <!--Tab Content: Notifications -->
+         @if (await FeatureChecker.IsEnabledAsync("Unity.Notifications")) {
+        <div class="tab-pane fade" id="nav-notifications" role="tabpanel"
+            aria-labelledby="nav-notifications-tab">
+            @await Component.InvokeAsync(typeof(Notifications), new { formid = Model?.ApplicationFormDto?.Id.ToString() })
+        </div>
+        }
+
+        @if (Model?.ShowAITab == true)
+        {
+            <!--Tab Content: AI Configuration-->
+            <div id="nav-ai-configuration" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
+                @await Component.InvokeAsync("AIConfiguration", new { formId = Model?.ApplicationFormDto?.Id })
+            </div>
+        }
+    </div>
+
+    <abp-modal centered="true" scrollable="true" size="Large" id="editMappingModal">
+            <abp-modal-header title="Edit Mapping JSON"></abp-modal-header>
+        <abp-modal-body>
+            <textarea id="jsonText" rows="15"
+                cols="80" aria-label="Mapping JSON">@Model?.ApplicationFormVersionDto?.SubmissionHeaderMapping</textarea>
+        </abp-modal-body>
+        <abp-modal-footer>
+            <abp-button id="btn-save-mapping" text="Save Mapping JSON" icon-type="Other"
+                class="btn unt-btn-primary btn-primary" abp-tooltip="Save the Mapping JSON" button-type="Primary" />
+            <abp-button id="btn-cancel-mapping" text="Cancel" icon-type="Other" class="btn unt-btn-link btn-link"
+                abp-tooltip="Cancel the Edit" button-type="Secondary" />
+        </abp-modal-footer>
+    </abp-modal>
+    <partial name="_AiSuggestionReviewModal" model="@mappingReviewModal" />
+    <partial name="_AiSuggestionReviewModal" model="@worksheetReviewModal" />
+    <partial name="_AiSuggestionReviewModal" model="@scoresheetReviewModal" />
+</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
index a725453560..42c582b81d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
@@ -1,386 +1,380 @@
-.col {
-    min-height: 40px;
-    border: 1px solid #6a6a6a;
-    border-radius: 10px;
-    overflow-y: scroll;
-    background-color: white;
-}
-
-.unt-tab-content .form-select {
-    width: auto;
-}
-
-#nav-tabContent.unt-tab-content {
-    display: flex;
-    flex-direction: column;
-    height: calc(100vh - 230px);
-    min-height: 0;
-}
-
-#nav-tabContent.unt-tab-content > .tab-pane.show.active {
-    display: flex;
-    flex: 1 1 auto;
-    flex-direction: column;
-    min-height: 0;
-}
-
-.configuration-action-bar {
-    align-items: center;
-    border-bottom: 1px solid #dee2e6;
-    padding-bottom: 0.5rem;
-    margin-bottom: 0.5rem;
-}
-
-    .configuration-action-bar h5 {
-        font-weight: 700;
-    }
-
-    .configuration-action-bar .btn, .configuration-action-bar .btn-group {
-        flex: none;
-        min-width: 100px;
-        padding: 0.375rem 0.75rem;
-        font-weight: 500;
-        transition: all 0.15s ease-in-out;
-        justify-content: center !important;
-    }
-
-    .configuration-action-bar .btn-wrapper {
-        gap: 0.5rem;
-        display: flex;
-        align-items: center;
-        justify-content: flex-end !important;
-        padding-right: 0;
-    }
-
-    .column {
-        float: left;
-        width: 40%;
-    }
-  
-  /* Clear floats after the columns */
-  .row:after {
-    content: "";
-    display: table;
-    clear: both;
-  }
-
-.card {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 10px;
-    width: fit-content;
-    padding: 2px;
-    padding-right: 6px;
-    padding-left: 6px;
-    margin: 4px;
-    text-align: center;
-    font-size: 16px;
-    cursor: grab;
-    background-image: linear-gradient(135deg, #f9f9fb 10%, #38598A 900%);
-}
-
-.dragging {
-    opacity: 0.5;
-}
-
-.chef-field-table {
-    overflow-y:scroll;
-    border: 1px solid #00000017;
-}
-
-caption {
-    padding: 10px;
-    padding-left: 2px;
-    position: fixed;
-    margin-bottom: 30px;
-    scroll-behavior: revert;
-    caption-side: top;
-    margin-top: -92px;
-    font-weight: 400;
-    width: unset;
-    font-size: 20px;
-    color: var(--bc-colors-blue-background, #38598A);
-    background-color: white;
-}
-
-.title {
-    padding: 10px;
-    padding-left: 0px;
-    font-weight: 400;
-    font-size: 20px;
-    margin-bottom: 0px;
-    margin-top: -8px;
-    color: var(--bc-colors-blue-background, #38598A);
-}
-
-table.dataTable thead th {
-    background-color: #55698A !important;
-    color: white;
-    font-weight: 500;
-    font-size: 18px;
-}
-
-table.dataTable td {
-    word-wrap: break-word;
-    max-width: 250px;
-    font-size: 15px !important;
-}
-
-.odd {
-    background-color: #efefef !important;
-}
-
-td {
-    background-color: transparent !important;
-}
-tr:nth-child(even) {background-color: #f2f2f2;}
-
-.content-div {
-    width: 100%;
-    height: auto;
-    margin: 0 auto;
-    position: relative;
-}
-
-.buttons {
-    width: fit-content;
-    display: block;
-}
-
-.ai-generate-btn:disabled,
-.ai-generate-btn.disabled,
-.ai-generate-btn[data-ai-shared-generating='1'],
-.ai-generate-btn[data-ai-cooldown-active='1'],
-.ai-generate-btn[data-ai-cooldown-checking='1'] {
-    cursor: not-allowed;
-    opacity: 0.55;
-    pointer-events: none;
-}
-
-.buttons-div {
-    display: inline-flex;
-    padding: 20px;
-    margin: auto;
-}
-
-.dataTables_filter, .dt-search {
-    margin-right: 10px;
-}
-
-.mappingForm {
-    margin-bottom: 20px;
-}
-
-.label {
-    padding: 4px;
-    white-space: nowrap;
-    color: var(--bc-colors-blue-background, #38598A);
-}
-
-.toast-top-center { 
-    top: 220px;
-    margin: 0 auto;
-    left: 50%;
-    margin-left: -450px;
-}
-
-thead tr:first-child th {
-    position: relative;
-    z-index: 12;
-    opacity: 1;
-}
-
-.table-title {
-    background-color: white;
-    font-size: 20px;
-    padding: 4px;
-    z-index: 23;
-    margin-left: 1px;
-    position: fixed;
-    float: left;
-}
-
-table.dataTable thead td {
-    font-size: 14px;
-}
-
-#intake-map-available-fields-column {
-    width: 96%;
-}
-
-.intake-mapping-title {
-    position: static;
-    float: left;
-    margin-top: 0px;
-    padding: 7px;
-    padding-top: 0px;
-    width: -webkit-fill-available;
-}
-
-div.row:first-child th {
-    position: sticky;
-    z-index: 12;
-    top: 50px;
-    opacity: 1;
-}
-
-div.dataTables_wrapper div.dataTables_filter,
-div.dataTables_wrapper div.dt-search {
-    text-align: right;
-    z-index: 2;
-    position: sticky;
-    background: white;
-    width: 100%;
-    margin-left: -156px;
-    padding: 3px;
-}
-
-.col-md-6 {
-    flex: 0 0 auto;
-    width: calc(65% - (.5em + 6px));
-    z-index: 22;
-    position: fixed;
-    overflow: hidden;
-    margin-bottom: 20px;
-    margin-top: -13px;
-    margin-left: 7px;
-}
-
-.form-version-label {
-    width: 400px;
-    margin-left: -74px;
-}
-
-textarea {
-    border: 1px solid #e9e9e9;
-}
-
-.display-modal {
-    opacity: 1 !important;
-    display: block !important;
-}
-
-.non-drag {
-    -webkit-user-drag: none;
-    user-select: none;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-}
-
-.dtfh-floatingparenthead {
-    position: relative !important;
-}
-
-.mapping-field {
-    display: block;
-    font-size: 0.9rem;
-}
-
-.mapping-field i {
-    font-size: 0.7rem;
-}
-
-.mapping-indicator-text {
-    font-size: 0.5rem;
-    text-align: center;
-    vertical-align: middle;
-    margin-right: 2px;
-}
-
-.published-tick {
-    background-color: var(--bs-btn-bg, #198754);
-    border-radius: 35px;
-    padding: 7px;
-    color: #fff;
-    width: 35px;
-    height: 35px;
-    margin-left: 5px;
-    padding-left: 9px;
-}
-
-.select-icon-wrapper {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-start;
-    align-items: center;
-}
-
-.form-label {
-    color: var(--bc-colors-blue-background, #38598A);
-    margin-bottom: 0.1rem;
-}
-
-.input-width {
-    width: 355px !important;
-}
-
-.input-button-wrapper {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;    
-    justify-content: flex-start;
-    align-items: center;
-    gap: 5px;
-}
-
-.unt-tab-content {
-    background:#FFF;
-    padding:15px;
-}
-
-.unt-label {
-    padding: 10px 0px;
-}
-
-.unt-mapping-container {
-    height: calc(97vh - 400px);
-    overflow: scroll;
-    overflow-x: hidden;
-    border: 1px solid black;
-}
-
-.custom-fields-container {
-    height: calc(97vh - 400px);
-    overflow: scroll;
-    overflow-x: hidden;
-}
-
-.nav-tabs .nav-link.active {
-    color: #003366;
-    border-bottom: 3px solid #003366;
-}
-
-.nav-tabs .nav-link {
-    background: #fff;
-    border-bottom: 1px solid #dee2e6;
-    padding: 10px 20px;
-}
-
-.intake-mapping-content {
-    height: calc(100vh - 200px);
-    overflow: auto;
-}
-
-.application-forms-table-content {
-    height: calc(100vh - 200px);
-    overflow: auto;
-    background: #fff;
-}
-
-.application-forms-table-content .table.dataTable { 
-    margin-top:0px !important;
-}
-.note{
-     font-size: 0.75rem; 
-}
-.direct-approval {
-    font-size: 0.9rem;
-}
-
-.worksheet-mapping-content {
-    height: calc(100vh - 250px);
-    overflow: auto;
-}
+.col {
+    min-height: 40px;
+    border: 1px solid #6a6a6a;
+    border-radius: 10px;
+    overflow-y: scroll;
+    background-color: white;
+}
+
+.unt-tab-content .form-select {
+    width: auto;
+}
+
+#nav-tabContent.unt-tab-content {
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh - 230px);
+    min-height: 0;
+}
+
+#nav-tabContent.unt-tab-content > .tab-pane.show.active {
+    display: flex;
+    flex: 1 1 auto;
+    flex-direction: column;
+    min-height: 0;
+}
+
+.configuration-action-bar {
+    align-items: center;
+    border-bottom: 1px solid #dee2e6;
+    padding-bottom: 0.5rem;
+    margin-bottom: 0.5rem;
+}
+
+.configuration-action-bar[data-ai-workflow-loading="true"] .ai-workflow-action {
+    visibility: hidden;
+}
+
+    .configuration-action-bar h5 {
+        font-weight: 700;
+    }
+
+    .configuration-action-bar .btn, .configuration-action-bar .btn-group {
+        flex: none;
+        min-width: 100px;
+        padding: 0.375rem 0.75rem;
+        font-weight: 500;
+        transition: all 0.15s ease-in-out;
+        justify-content: center !important;
+    }
+
+    .configuration-action-bar .btn-wrapper {
+        gap: 0.5rem;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end !important;
+        padding-right: 0;
+    }
+
+    .column {
+        float: left;
+        width: 40%;
+    }
+
+  /* Clear floats after the columns */
+  .row:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+
+.card {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 10px;
+    width: fit-content;
+    padding: 2px;
+    padding-right: 6px;
+    padding-left: 6px;
+    margin: 4px;
+    text-align: center;
+    font-size: 16px;
+    cursor: grab;
+    background-image: linear-gradient(135deg, #f9f9fb 10%, #38598A 900%);
+}
+
+.dragging {
+    opacity: 0.5;
+}
+
+.chef-field-table {
+    overflow-y:scroll;
+    border: 1px solid #00000017;
+}
+
+caption {
+    padding: 10px;
+    padding-left: 2px;
+    position: fixed;
+    margin-bottom: 30px;
+    scroll-behavior: revert;
+    caption-side: top;
+    margin-top: -92px;
+    font-weight: 400;
+    width: unset;
+    font-size: 20px;
+    color: var(--bc-colors-blue-background, #38598A);
+    background-color: white;
+}
+
+.title {
+    padding: 10px;
+    padding-left: 0px;
+    font-weight: 400;
+    font-size: 20px;
+    margin-bottom: 0px;
+    margin-top: -8px;
+    color: var(--bc-colors-blue-background, #38598A);
+}
+
+table.dataTable thead th {
+    background-color: #55698A !important;
+    color: white;
+    font-weight: 500;
+    font-size: 18px;
+}
+
+table.dataTable td {
+    word-wrap: break-word;
+    max-width: 250px;
+    font-size: 15px !important;
+}
+
+.odd {
+    background-color: #efefef !important;
+}
+
+td {
+    background-color: transparent !important;
+}
+tr:nth-child(even) {background-color: #f2f2f2;}
+
+.content-div {
+    width: 100%;
+    height: auto;
+    margin: 0 auto;
+    position: relative;
+}
+
+.buttons {
+    width: fit-content;
+    display: block;
+}
+
+.buttons-div {
+    display: inline-flex;
+    padding: 20px;
+    margin: auto;
+}
+
+.dataTables_filter, .dt-search {
+    margin-right: 10px;
+}
+
+.mappingForm {
+    margin-bottom: 20px;
+}
+
+.label {
+    padding: 4px;
+    white-space: nowrap;
+    color: var(--bc-colors-blue-background, #38598A);
+}
+
+.toast-top-center {
+    top: 220px;
+    margin: 0 auto;
+    left: 50%;
+    margin-left: -450px;
+}
+
+thead tr:first-child th {
+    position: relative;
+    z-index: 12;
+    opacity: 1;
+}
+
+.table-title {
+    background-color: white;
+    font-size: 20px;
+    padding: 4px;
+    z-index: 23;
+    margin-left: 1px;
+    position: fixed;
+    float: left;
+}
+
+table.dataTable thead td {
+    font-size: 14px;
+}
+
+#intake-map-available-fields-column {
+    width: 96%;
+}
+
+.intake-mapping-title {
+    position: static;
+    float: left;
+    margin-top: 0px;
+    padding: 7px;
+    padding-top: 0px;
+    width: -webkit-fill-available;
+}
+
+div.row:first-child th {
+    position: sticky;
+    z-index: 12;
+    top: 50px;
+    opacity: 1;
+}
+
+div.dataTables_wrapper div.dataTables_filter,
+div.dataTables_wrapper div.dt-search {
+    text-align: right;
+    z-index: 2;
+    position: sticky;
+    background: white;
+    width: 100%;
+    margin-left: -156px;
+    padding: 3px;
+}
+
+.col-md-6 {
+    flex: 0 0 auto;
+    width: calc(65% - (.5em + 6px));
+    z-index: 22;
+    position: fixed;
+    overflow: hidden;
+    margin-bottom: 20px;
+    margin-top: -13px;
+    margin-left: 7px;
+}
+
+.form-version-label {
+    width: 400px;
+    margin-left: -74px;
+}
+
+textarea {
+    border: 1px solid #e9e9e9;
+}
+
+.display-modal {
+    opacity: 1 !important;
+    display: block !important;
+}
+
+.non-drag {
+    -webkit-user-drag: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+}
+
+.dtfh-floatingparenthead {
+    position: relative !important;
+}
+
+.mapping-field {
+    display: block;
+    font-size: 0.9rem;
+}
+
+.mapping-field i {
+    font-size: 0.7rem;
+}
+
+.mapping-indicator-text {
+    font-size: 0.5rem;
+    text-align: center;
+    vertical-align: middle;
+    margin-right: 2px;
+}
+
+.published-tick {
+    background-color: var(--bs-btn-bg, #198754);
+    border-radius: 35px;
+    padding: 7px;
+    color: #fff;
+    width: 35px;
+    height: 35px;
+    margin-left: 5px;
+    padding-left: 9px;
+}
+
+.select-icon-wrapper {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+}
+
+.form-label {
+    color: var(--bc-colors-blue-background, #38598A);
+    margin-bottom: 0.1rem;
+}
+
+.input-width {
+    width: 355px !important;
+}
+
+.input-button-wrapper {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+    gap: 5px;
+}
+
+.unt-tab-content {
+    background:#FFF;
+    padding:15px;
+}
+
+.unt-label {
+    padding: 10px 0px;
+}
+
+.unt-mapping-container {
+    height: calc(97vh - 400px);
+    overflow: scroll;
+    overflow-x: hidden;
+    border: 1px solid black;
+}
+
+.custom-fields-container {
+    height: calc(97vh - 400px);
+    overflow: scroll;
+    overflow-x: hidden;
+}
+
+.nav-tabs .nav-link.active {
+    color: #003366;
+    border-bottom: 3px solid #003366;
+}
+
+.nav-tabs .nav-link {
+    background: #fff;
+    border-bottom: 1px solid #dee2e6;
+    padding: 10px 20px;
+}
+
+.intake-mapping-content {
+    height: calc(100vh - 200px);
+    overflow: auto;
+}
+
+.application-forms-table-content {
+    height: calc(100vh - 200px);
+    overflow: auto;
+    background: #fff;
+}
+
+.application-forms-table-content .table.dataTable {
+    margin-top:0px !important;
+}
+.note{
+     font-size: 0.75rem;
+}
+.direct-approval {
+    font-size: 0.9rem;
+}
+
+.worksheet-mapping-content {
+    height: calc(100vh - 250px);
+    overflow: auto;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
index 90f11986d9..e7f9a8d0a2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
@@ -1,1021 +1,1707 @@
-$(function () {
-    let availableChefFieldsString = document.getElementById('availableChefsFields').value;
-    let existingMappingString = document.getElementById('existingMapping').value;
-    let intakeFieldsString = document.getElementById('intakeProperties').value;
-    let chefsFormId = document.getElementById('chefsFormId').value;
-    let formVersionId = document.getElementById('formVersionId').value;
-    let intakeMapColumn = document.querySelector('#intake-map-available-fields-column');
-    let worksheetMapColumn = document.querySelector('#worksheet-map-available-fields-column');
-    let excludedIntakeMappings = new Set(['ConfirmationId', 'SubmissionId', 'SubmissionDate']);
-    let dataTable;
-
-    let allowableTypes = new Set(['textarea',
-        'orgbook',
-        'textfield',
-        'currency',
-        'datetime',
-        'checkbox',
-        'select',
-        'selectboxes',
-        'radio',
-        'phoneNumber',
-        'email',
-        'number',
-        'time',
-        'day',
-        'hidden',
-        'simpletextfield',
-        'simpletextfieldadvanced',
-        'simpletime',
-        'simpletimeadvanced',
-        'simplenumber',
-        'simplenumberadvanced',
-        'simplephonenumber',
-        'simplephonenumberadvanced',
-        'simpleselect',
-        'simpleselectadvanced',
-        'simpleday',
-        'simpledayadvanced',
-        'simpleemail',
-        'simpleemailadvanced',
-        'simpledatetime',
-        'simpledatetimeadvanced',
-        'simpleurladvanced',
-        'simplecheckbox',
-        'simpleradios',
-        'simpleradioadvanced',
-        'simplecheckboxes',
-        'simplecheckboxadvanced',
-        'simplecurrencyadvanced',
-        'simpletextarea',
-        'simpletextareaadvanced',
-        'bcaddress',
-        'datagrid']);
-
-    const UIElements = {
-        btnBack: $('#btn-back'),
-        btnSave: $('#btn-save'),
-        btnEdit: $('#btn-edit'),
-        btnGenerate: $('#btn-generate'),
-        btnGenerateWorksheet: $('#btn-generate-worksheet'),
-        btnGenerateScoresheet: $('#btn-generate-scoresheet'),
-        btnReviewWorksheet: $('#btn-review-worksheet'),
-        worksheetReviewModal: $('#aiWorksheetReviewModal'),
-        worksheetReviewFields: $('#aiWorksheetReviewFields'),
-        worksheetReviewEmpty: $('#aiWorksheetReviewEmpty'),
-        worksheetTitle: $('#aiWorksheetTitle'),
-        btnCreateWorksheetDraft: $('#btn-create-ai-worksheet-draft'),
-        btnDiscardWorksheet: $('#btn-discard-ai-worksheet'),
-        btnSync: $('#btn-sync'),
-        btnReset: $('#btn-reset'),
-        btnClose: $('.btn-close'),
-        btnSaveMapping: $('#btn-save-mapping'),
-        btnCancel: $('#btn-cancel-mapping'),
-        inputSearchBar: $('#search-bar'),
-        selectVersionList: $('#applicationFormVersion'),
-        editMappingModal: $('#editMappingModal'),
-        uiConfigurationTab: $('#nav-ui-configuration'),
-        mappingTab: $('#nav-mapping-tab'),
-        customFieldsTab: $('#nav-worksheet-fields-tab'),
-        intakeFieldsTab: $('#nav-intake-fields-tab'),
-        refreshAvailableWorksheetsHidden: $('#refresh_available_worksheets')
-    };
-
-    init();
-
-    function init() {
-        bindUIEvents();
-        restoreActiveTab();
-        dataTable = initializeApplicationFormsTable();
-        let availableChefsFields = availableChefFieldsString ? JSON.parse(availableChefFieldsString) : []
-        initializeIntakeMap(availableChefsFields);
-        bindExistingMaps();
-        setupTooltips();
-        initializeUIConfiguration();
-    }
-
-    function setupTooltips() {
-        $('[data-toggle="tooltip"]').tooltip({
-            placement: 'top'
-        });
-    }
-
-    function bindUIEvents() {
-        UIElements.btnBack.on('click', handleBack);
-        UIElements.btnSave.on('click', handleSave);
-        UIElements.btnSaveMapping.on('click', handleSaveEditMapping);
-        UIElements.btnSync.on('click', handleSync);
-        UIElements.btnEdit.on('click', handleEdit);
-        UIElements.btnGenerate.on('click', queueFormMapping);
-        UIElements.btnGenerateWorksheet.on('click', queueFormWorksheet);
-        UIElements.btnGenerateScoresheet.on('click', queueFormScoresheet);
-        UIElements.btnReviewWorksheet.on('click', loadAiWorksheetReview);
-        UIElements.btnCreateWorksheetDraft.on('click', createAiWorksheetDraft);
-        UIElements.btnDiscardWorksheet.on('click', discardAiWorksheetSuggestions);
-        UIElements.worksheetReviewFields.on('change', 'input[data-field-id]', updateAiWorksheetReview);
-        $('#aiWorksheetReviewSelectAll').on('change', toggleAiWorksheetReviewAll);
-        UIElements.worksheetTitle.on('input', updateAiWorksheetDraftButton);
-        UIElements.btnReset.on('click', handleReset);
-        UIElements.btnCancel.on('click', handleCancelMapping);
-        UIElements.btnClose.on('click', handleCancelMapping);
-        UIElements.inputSearchBar.on('keyup', handleSeearchBar);
-        UIElements.selectVersionList.on('change', handleSelectVersion);
-        UIElements.mappingTab.on('click', handleMappingTabClick);
-
-        // Persist active tab to localStorage on switch
-        $('#nav-tab').on('shown.bs.tab', 'button[data-bs-toggle="tab"]', function () {
-            const formId = document.getElementById('applicationFormId')?.value;
-            if (formId) {
-                localStorage.setItem('mapping-active-tab:' + formId, this.id);
-            }
-        });
-    }
-
-    function restoreActiveTab() {
-        const formId = document.getElementById('applicationFormId')?.value;
-        if (!formId) return;
-        const savedTabId = localStorage.getItem('mapping-active-tab:' + formId);
-        if (!savedTabId) return;
-        const tabEl = document.getElementById(savedTabId);
-        if (tabEl) {
-            bootstrap.Tab.getOrCreateInstance(tabEl).show();
-        }
-    }
-
-    function initializeUIConfiguration() {
-        const providerName = 'F';
-        const providerKey = $('#applicationFormId').val();
-        const providerKeyDisplayName = 'Test.Display.Name';
-
-        $.ajax({
-            url: abp.appPath + 'SettingManagement/ZoneManagement',
-            type: 'GET',
-            data: {
-                providerName: providerName,
-                providerKey: providerKey,
-                providerKeyDisplayName: providerKeyDisplayName
-            },
-            success: function (response) {
-                UIElements.uiConfigurationTab.html(response);
-            },
-            error: function () {
-                abp.notify.error('Failed to load UI Configuration.');
-            }
-        });
-    }
-
-    function handleEdit() {
-        $('#jsonText').val(prettyJson(existingMappingString));
-        UIElements.editMappingModal.addClass('display-modal');
-    }
-
-    function queueFormMapping(triggerButton = null) {
-        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
-        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
-        if (!validateGuid(formVersion)) {
-            abp.notify.error('', 'The Form Version ID is not in a GUID format');
-            return;
-        }
-        if (!validateGuid(applicationId)) {
-            abp.notify.error('', 'The Application ID is not in a GUID format');
-            return;
-        }
-
-        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerate?.get?.(0);
-        const $button = $(buttonElement);
-        const existingHtml = $button.html();
-
-        if ($button.prop('disabled')) {
-            return;
-        }
-
-        globalThis.AIGenerationButtonState?.setGenerating($button);
-
-        abp.ajax({
-            url: `/api/app/ai/generation/form-mapping?applicationId=${encodeURIComponent(applicationId)}&applicationFormVersionId=${encodeURIComponent(formVersion)}`,
-            type: 'POST',
-        })
-            .done(function (generationStatus) {
-                const request = generationStatus?.generationRequest;
-                const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
-
-                if (status === 'Completed') {
-                    globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
-                    globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
-                    refreshMappingAfterGeneration(applicationId, formVersion);
-                    return;
-                }
-
-                monitorFormMappingGeneration(applicationId, $button, existingHtml);
-            })
-            .fail(function (error) {
-                if (globalThis.AIGenerationButtonState?.handleQueueFailure(error)) {
-                    return;
-                }
-
-                abp.message.error('Failed to queue AI mapping generation. Please try again.');
-                restoreGenerateMappingButton($button, existingHtml);
-                globalThis.syncAIRateLimitButtons?.();
-            });
-    }
-
-    function queueFormWorksheet(triggerButton = null) {
-        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
-        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
-        if (!validateGuid(formVersion) || !validateGuid(applicationId)) {
-            abp.notify.error('', 'The Form Version ID or Application ID is not in a GUID format');
-            return;
-        }
-
-        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerateWorksheet?.get?.(0);
-        const $button = $(buttonElement);
-
-        if (isAiWorksheetPending()) {
-            loadAiWorksheetReview();
-            return;
-        }
-
-        const existingHtml = $button.html();
-
-        if ($button.prop('disabled')) {
-            return;
-        }
-
-        globalThis.AIGenerationButtonState?.setGenerating($button);
-
-        abp.ajax({
-            url: `/api/app/ai/generation/form-worksheet?applicationId=${encodeURIComponent(applicationId)}&applicationFormVersionId=${encodeURIComponent(formVersion)}`,
-            type: 'POST',
-        })
-            .done(function (generationStatus) {
-                const request = generationStatus?.generationRequest;
-                const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
-                if (status === 'Completed') {
-                    globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
-                    globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
-                    refreshWorksheetAfterGeneration();
-                    return;
-                }
-
-                monitorFormWorksheetGeneration(applicationId, $button, existingHtml);
-            })
-            .fail(function (error) {
-                if (globalThis.AIGenerationButtonState?.handleQueueFailure(error)) {
-                    return;
-                }
-
-                abp.message.error('Failed to queue AI worksheet generation. Please try again.');
-                restoreGenerateWorksheetButton($button, existingHtml);
-                globalThis.syncAIRateLimitButtons?.();
-            });
-    }
-
-    function monitorFormWorksheetGeneration(applicationId, $button, existingHtml) {
-        globalThis.AIGenerationButtonState?.monitor({
-            $button,
-            originalHtml: existingHtml,
-            getStatus: () => abp.ajax({
-                url: `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=form-worksheet`,
-                type: 'GET'
-            }),
-            onComplete: function () {
-                refreshWorksheetAfterGeneration();
-            },
-            onFailed: function (request) {
-                abp.message.error(request?.failureReason || 'AI worksheet generation failed.');
-            },
-            onPollFailed: function () {
-                abp.message.error('Unable to load AI worksheet generation status. Please try again.');
-            }
-        });
-    }
-
-    function queueFormScoresheet(triggerButton = null) {
-        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
-        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
-        if (!validateGuid(formVersion) || !validateGuid(applicationId)) {
-            abp.notify.error('', 'The Form Version ID or Application ID is not in a GUID format');
-            return;
-        }
-
-        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerateScoresheet?.get?.(0);
-        const $button = $(buttonElement);
-        const existingHtml = $button.html();
-
-        if ($button.prop('disabled')) {
-            return;
-        }
-
-        globalThis.AIGenerationButtonState?.setGenerating($button);
-
-        abp.ajax({
-            url: `/api/app/ai/generation/form-scoresheet?applicationId=${encodeURIComponent(applicationId)}&applicationFormVersionId=${encodeURIComponent(formVersion)}`,
-            type: 'POST',
-        })
-            .done(function (generationStatus) {
-                const request = generationStatus?.generationRequest;
-                const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
-                if (status === 'Completed') {
-                    globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
-                    globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
-                    refreshScoresheetAfterGeneration();
-                    return;
-                }
-
-                monitorFormScoresheetGeneration(applicationId, $button, existingHtml);
-            })
-            .fail(function (error) {
-                if (globalThis.AIGenerationButtonState?.handleQueueFailure(error)) {
-                    return;
-                }
-
-                abp.message.error('Failed to queue AI scoresheet generation. Please try again.');
-                restoreGenerateScoresheetButton($button, existingHtml);
-                globalThis.syncAIRateLimitButtons?.();
-            });
-    }
-
-    function monitorFormScoresheetGeneration(applicationId, $button, existingHtml) {
-        globalThis.AIGenerationButtonState?.monitor({
-            $button,
-            originalHtml: existingHtml,
-            getStatus: () => abp.ajax({
-                url: `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=form-scoresheet`,
-                type: 'GET'
-            }),
-            onComplete: function () {
-                refreshScoresheetAfterGeneration();
-            },
-            onFailed: function (request) {
-                abp.message.error(request?.failureReason || 'AI scoresheet generation failed.');
-            },
-            onPollFailed: function () {
-                abp.message.error('Unable to load AI scoresheet generation status. Please try again.');
-            }
-        });
-    }
-
-    function refreshWorksheetAfterGeneration() {
-        setAiWorksheetPending(true);
-        abp.notify.success('', 'Worksheet generated. Review the suggested fields and create draft worksheets.');
-        loadAiWorksheetReview();
-    }
-
-    function isAiWorksheetPending() {
-        return UIElements.btnGenerateWorksheet.attr('data-ai-pending') === 'true';
-    }
-
-    function setAiWorksheetPending(isPending) {
-        UIElements.btnGenerateWorksheet
-            .attr('data-ai-pending', isPending ? 'true' : 'false')
-            .toggleClass('d-none', isPending);
-        UIElements.btnReviewWorksheet.toggleClass('d-none', !isPending);
-
-        if (!isPending) {
-            globalThis.syncAIRateLimitButtons?.();
-        }
-    }
-
-    function loadAiWorksheetReview() {
-        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
-        if (!validateGuid(formVersion)) {
-            abp.notify.error('', 'Unable to review the worksheet because the Form Version ID is invalid.');
-            return;
-        }
-
-        abp.ajax({
-            url: `/api/app/application-form-version/pending-ai-worksheet?formVersionId=${encodeURIComponent(formVersion)}`,
-            type: 'GET'
-        })
-            .done(function (worksheet) {
-                if (!worksheet) {
-                    setAiWorksheetPending(false);
-                    abp.notify.error('', 'The pending AI worksheet is no longer available.');
-                    return;
-                }
-
-                renderAiWorksheetReview(worksheet);
-                UIElements.worksheetReviewModal.modal('show');
-            })
-            .fail(function () {
-                abp.notify.error('', 'Unable to load the pending AI worksheet.');
-            });
-    }
-
-    function renderAiWorksheetReview(worksheet) {
-        UIElements.worksheetReviewFields.empty();
-
-        const fields = worksheet.fields || [];
-        fields.forEach(function (field) {
-            const fieldId = `ai-worksheet-field-${field.id}`;
-            const $row = $('<div class="ai-worksheet-review__field"></div>');
-            $('<span class="ai-worksheet-review__field-name"></span>')
-                .attr('data-field-role', 'Source')
-                .text(field.key || '—')
-                .appendTo($row);
-            $('<i class="fa-solid fa-arrow-right ai-worksheet-review__arrow" aria-hidden="true"></i>').appendTo($row);
-            $('<span class="ai-worksheet-review__field-name"></span>')
-                .attr('data-field-role', 'Worksheet')
-                .text(field.label || field.key || '—')
-                .appendTo($row);
-            const $switch = $('<div class="ai-worksheet-review__switch"></div>');
-            const $switchContainer = $('<div class="form-check unt-form-switch form-switch mb-0"></div>');
-            $('<input class="form-check-input" type="checkbox">')
-                .attr('id', fieldId)
-                .attr('data-field-id', field.id)
-                .attr('aria-label', `Include ${field.label || field.key || 'field'}`)
-                .prop('checked', field.selected !== false)
-                .appendTo($switchContainer);
-            $switchContainer.appendTo($switch);
-            $switch.appendTo($row);
-            $row.appendTo(UIElements.worksheetReviewFields);
-        });
-
-        UIElements.worksheetReviewFields.attr('data-session-id', worksheet.sessionId);
-        UIElements.worksheetReviewEmpty.toggleClass('d-none', fields.length > 0);
-        updateAiWorksheetReview();
-    }
-
-    function updateAiWorksheetReview() {
-        const $fields = UIElements.worksheetReviewFields.find('input[data-field-id]');
-        const selectedCount = $fields.filter(':checked').length;
-        $('#aiWorksheetReviewSelectAll')
-            .prop('checked', $fields.length > 0 && selectedCount === $fields.length)
-            .prop('indeterminate', false);
-        updateAiWorksheetDraftButton();
-    }
-
-    function toggleAiWorksheetReviewAll() {
-        UIElements.worksheetReviewFields.find('input[data-field-id]').prop('checked', $(this).prop('checked'));
-        updateAiWorksheetReview();
-    }
-
-    function updateAiWorksheetDraftButton() {
-        const hasTitle = String(UIElements.worksheetTitle.val() ?? '').trim().length > 0;
-        const hasSelectedFields = UIElements.worksheetReviewFields.find('input[data-field-id]:checked').length > 0;
-        UIElements.btnCreateWorksheetDraft.prop('disabled', !hasTitle || !hasSelectedFields);
-    }
-
-    function createAiWorksheetDraft() {
-        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
-        const sessionId = UIElements.worksheetReviewFields.attr('data-session-id');
-        const title = String(UIElements.worksheetTitle.val() ?? '').trim();
-        const selectedFieldIds = UIElements.worksheetReviewFields
-            .find('input[data-field-id]:checked')
-            .map(function () { return $(this).attr('data-field-id'); })
-            .get();
-
-        if (!validateGuid(formVersion) || !validateGuid(sessionId) || !title || selectedFieldIds.length === 0) {
-            abp.notify.error('', 'Enter a worksheet title and select at least one suggested field.');
-            return;
-        }
-
-        UIElements.btnCreateWorksheetDraft.prop('disabled', true);
-        UIElements.btnDiscardWorksheet.prop('disabled', true);
-
-        abp.ajax({
-            url: `/api/app/application-form-version/create-ai-worksheet-draft?formVersionId=${encodeURIComponent(formVersion)}`,
-            type: 'POST',
-            contentType: 'application/json',
-            data: JSON.stringify({ sessionId, title, selectedFieldIds })
-        })
-            .done(function () {
-                UIElements.worksheetTitle.val('');
-                abp.notify.success('', 'Draft worksheet created.');
-                refreshAiWorksheetReviewAfterDraftCreation(formVersion);
-            })
-            .fail(function () {
-                abp.notify.error('', 'Unable to create the draft worksheet.');
-            })
-            .always(function () {
-                UIElements.btnDiscardWorksheet.prop('disabled', false);
-                updateAiWorksheetDraftButton();
-            });
-    }
-
-    function refreshAiWorksheetReviewAfterDraftCreation(formVersion) {
-        abp.ajax({
-            url: `/api/app/application-form-version/pending-ai-worksheet?formVersionId=${encodeURIComponent(formVersion)}`,
-            type: 'GET'
-        })
-            .done(function (worksheet) {
-                if (!worksheet) {
-                    UIElements.worksheetReviewModal.modal('hide');
-                    setAiWorksheetPending(false);
-                    return;
-                }
-
-                renderAiWorksheetReview(worksheet);
-            })
-            .fail(function () {
-                abp.notify.error('', 'Draft created, but the remaining suggestions could not be loaded.');
-            });
-    }
-
-    function discardAiWorksheetSuggestions() {
-        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
-        if (!validateGuid(formVersion) || !isAiWorksheetPending()) {
-            return;
-        }
-
-        abp.message.confirm(
-            'This will permanently remove the remaining AI field suggestions.',
-            'Discard remaining suggestions?')
-            .then(function (confirmed) {
-                if (!confirmed) {
-                    return;
-                }
-
-                UIElements.btnCreateWorksheetDraft.prop('disabled', true);
-                UIElements.btnDiscardWorksheet.prop('disabled', true);
-                abp.ajax({
-                    url: `/api/app/application-form-version/discard-ai-worksheet-suggestions?formVersionId=${encodeURIComponent(formVersion)}`,
-                    type: 'POST'
-                })
-                    .done(function () {
-                        setAiWorksheetPending(false);
-                        UIElements.worksheetReviewModal.modal('hide');
-                        abp.notify.success('', 'Remaining AI worksheet suggestions discarded.');
-                    })
-                    .fail(function () {
-                        abp.notify.error('', 'Unable to discard the remaining AI worksheet suggestions.');
-                    })
-                    .always(function () {
-                        UIElements.btnDiscardWorksheet.prop('disabled', false);
-                        updateAiWorksheetDraftButton();
-                    });
-            });
-    }
-
-    function refreshScoresheetAfterGeneration() {
-        abp.notify.success('', 'Scoresheet generated and assigned successfully. Reloading page.');
-        setTimeout(function () {
-            globalThis.location.reload();
-        }, 500);
-    }
-
-    function monitorFormMappingGeneration(applicationId, $button, existingHtml) {
-        globalThis.AIGenerationButtonState?.monitor({
-            $button,
-            originalHtml: existingHtml,
-            getStatus: () => abp.ajax({
-                url: `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=form-mapping`,
-                type: 'GET'
-            }),
-            onComplete: function () {
-                refreshMappingAfterGeneration(applicationId);
-            },
-            onFailed: function (request) {
-                abp.message.error(request?.failureReason || 'AI mapping generation failed.');
-            },
-            onPollFailed: function () {
-                abp.message.error('Unable to load AI mapping generation status. Please try again.');
-            }
-        });
-    }
-
-    function refreshMappingAfterGeneration(applicationId, formVersion = null) {
-        const resolvedFormVersion = String(formVersion ?? document.getElementById('formVersionId')?.value ?? '').trim();
-        if (!validateGuid(resolvedFormVersion)) {
-            abp.notify.error('', 'Unable to refresh the generated mapping because the Form Version ID is invalid.');
-            return;
-        }
-
-        abp.ajax({
-            url: `/api/app/application-form-version/${encodeURIComponent(resolvedFormVersion)}`,
-            type: 'GET'
-        })
-            .done(function (applicationFormVersionDto) {
-                const availableChefsFields = applicationFormVersionDto?.availableChefsFields
-                    ? JSON.parse(applicationFormVersionDto.availableChefsFields)
-                    : [];
-
-                $('#applicationFormVersionDtoString').val(JSON.stringify(applicationFormVersionDto ?? {}));
-                $('#availableChefsFields').val(applicationFormVersionDto?.availableChefsFields ?? '');
-                $('#existingMapping').val(applicationFormVersionDto?.submissionHeaderMapping ?? '');
-
-                existingMappingString = applicationFormVersionDto?.submissionHeaderMapping ?? '';
-                availableChefFieldsString = applicationFormVersionDto?.availableChefsFields ?? '';
-
-                $(intakeMapColumn).empty();
-                $(worksheetMapColumn).empty();
-                dataTable.clear().draw();
-                initializeIntakeMap(availableChefsFields);
-                bindExistingMaps();
-
-                abp.notify.success('', 'Form mapping generated and saved successfully.');
-            })
-            .fail(function () {
-                abp.notify.error('', 'Form mapping generated, but the page could not refresh the saved mapping.');
-            });
-    }
-
-    function restoreGenerateMappingButton($button, existingHtml) {
-        if (!$button?.length) {
-            return;
-        }
-
-        globalThis.AIGenerationButtonState?.restore($button);
-        $button.html(existingHtml).prop('disabled', false);
-        $button.find('span').last().text('Generate Mapping');
-    }
-
-    function restoreGenerateWorksheetButton($button, existingHtml) {
-        if (!$button?.length) {
-            return;
-        }
-
-        globalThis.AIGenerationButtonState?.restore($button);
-        $button.html(existingHtml).prop('disabled', false);
-        $button.find('span').last().text(isAiWorksheetPending() ? 'Review Worksheet' : 'Generate Worksheet');
-    }
-
-    function restoreGenerateScoresheetButton($button, existingHtml) {
-        if (!$button?.length) {
-            return;
-        }
-
-        globalThis.AIGenerationButtonState?.restore($button);
-        $button.html(existingHtml).prop('disabled', false);
-        $button.find('span').last().text('Generate Scoresheet');
-    }
-
-    function handleSaveEditMapping() {
-        try {
-            let jsonText = $('#jsonText').val();
-            $.parseJSON(jsonText);
-            let mappingJsonStr = jsonText.replaceAll(/\s+/g, ' ').replaceAll(/(\r\n|\n|\r)/gm, "");
-            UIElements.btnSaveMapping.prop('disabled', true);
-            handleSaveMapping($.parseJSON(mappingJsonStr));
-            handleCancelMapping();
-
-            abp.notify.success(
-                '',
-                'Edit mapping save successful. Reloading page to new version'
-            );
-
-            setTimeout(function () {
-                globalThis.location.href = location.href;
-            }, 500);
-
-        }
-        catch (err) {
-            UIElements.btnSaveMapping.prop('disabled', false);
-            abp.notify.error(
-                '',
-                'The JSON is not valid:' + err
-            );
-        }
-    }
-
-    function handleCancelMapping() {
-        UIElements.editMappingModal.removeClass('display-modal');
-    }
-
-    function handleSeearchBar(e) {
-        let filterValue = e.currentTarget.value;
-        let oTable = $('#ApplicationFormsTable').dataTable();
-        oTable.fnFilter(filterValue);
-    }
-
-    function handleSelectVersion(e) {
-        let chefsFormVersionGuid = e.currentTarget.value;
-        navigateToVersion(chefsFormVersionGuid);
-    }
-
-    function navigateToVersion(chefsFormVersionGuid) {
-        abp.notify.success(
-            '',
-            'Reloading page to new version'
-        );
-
-        setTimeout(function () {
-            const url = new URL(globalThis.location.href);
-
-            // If this really is a GUID, validate it defensively
-            if (!/^[0-9a-fA-F-]{36}$/.test(chefsFormVersionGuid)) {
-                abp.notify.error("The CHEFS Form Version ID is not in a GUID format");
-                return; // or handle error                
-            }
-
-            url.searchParams.set("ChefsFormVersionGuid", chefsFormVersionGuid);
-            globalThis.location.href = url.toString();
-        }, 500);
-    }
-
-    function bindExistingMaps() {
-        if (existingMappingString + "" != "undefined" && existingMappingString != null && existingMappingString != "") {
-            try {
-                let existingMapping = JSON.parse(existingMappingString);
-                let keys = Object.keys(existingMapping);
-                for (let key of keys) {
-                    let intakeProperty = key;
-                    let chefsMappingProperty = existingMapping[intakeProperty];
-                    let intakeMappingCard = document.getElementById("unity_" + intakeProperty);
-                    let chefsMappingDiv = document.getElementById(chefsMappingProperty);
-                    if (chefsMappingDiv != null && intakeMappingCard != null) {
-                        chefsMappingDiv.appendChild(intakeMappingCard);
-                    } else {
-                        abp.notify.error(
-                            '',
-                            'Could not map existing: ' + chefsMappingProperty
-                        );
-                    }
-                }
-            } catch (err) {
-                console.log(err);
-            }
-        }
-    }
-
-
-
-    function handleSync() {
-        let chefsFormVersionId = document.getElementById('chefsFormVersionId').value;
-        if (!validateGuid(chefsFormVersionId)) {
-            abp.notify.error(
-                '',
-                'The Form Version ID is not in a GUID format'
-            );
-            return;
-        }
-
-        if (chefsFormVersionId == "") {
-            abp.notify.error(
-                '',
-                'ChefsFormVersionGuid is neeeded - Mapping Not Synchronized Successful'
-            );
-
-        } else {
-            $.ajax(
-                {
-                    url: `/api/app/form/${chefsFormId}/version/${chefsFormVersionId}`,
-                    type: "POST",
-                    success: function (data) {
-                        let formVersion = data.formVersion;
-                        let updatedApplicationFormName = data.updatedFormName;
-                        let updatedNameMessage = updatedApplicationFormName ? 'Form name updated to ' + updatedApplicationFormName : 'Form name is unchanged';
-                        if (updatedApplicationFormName) {
-                            document.getElementById('applicationFormName').textContent = updatedApplicationFormName;
-                        }
-
-                        let availableChefsFields = JSON.parse(formVersion.availableChefsFields)
-                        document.getElementById('availableChefsFields').value = JSON.stringify(availableChefsFields);
-                        initializeIntakeMap(availableChefsFields);
-
-                        abp.notify.success(
-                            '',
-                            'Synchronized Successful' + updatedNameMessage
-                        );
-                        navigateToVersion(formVersion.chefsFormVersionGuid);
-                    },
-                    error: function () {
-                        abp.notify.error(
-                            '',
-                            'Mapping Not Synchronized Successful'
-                        );
-                    }
-                }
-            );
-        }
-    }
-
-
-
-    function handleSave() {
-        let mappingDivs = $('.map-div');
-        let mappingJson = {};
-
-        for (let mappingDiv of mappingDivs) {
-            let chefMappingDiv = mappingDiv;
-            if (chefMappingDiv.childElementCount > 0) {
-
-                let chefsKey = mappingDiv.id;
-                let intakeMappingChildren = chefMappingDiv.children;
-
-                for (let intakeMappingChild of intakeMappingChildren) {
-                    mappingJson[intakeMappingChild.id.replace('unity_', '')] = chefsKey;
-                }
-            }
-        }
-        handleSaveMapping(mappingJson);
-    }
-
-    function handleSaveMapping(mappingJson) {
-        let formData = JSON.parse(document.getElementById('applicationFormVersionDtoString').value);
-        formData["submissionHeaderMapping"] = JSON.stringify(mappingJson);
-        formData["availableChefsFields"] = document.getElementById('availableChefsFields').value;
-        formData["ChefsApplicationFormGuid"] = document.getElementById('applicationFormId').value;
-
-        UIElements.btnSave.prop('disabled', true);
-        $.ajax(
-            {
-                url: "/api/app/application-form-version/" + formVersionId,
-                data: JSON.stringify(formData),
-                contentType: "application/json",
-                type: "PUT",
-                success: function (data) {
-                    $('#existingMapping').val(data.submissionHeaderMapping);
-                    existingMappingString = data.submissionHeaderMapping;
-                    abp.notify.success(
-                        data.responseText,
-                        'Mapping Saved Successfully'
-                    );
-                },
-                error: function (data) {
-                    abp.notify.error(
-                        data.responseText,
-                        'Mapping Not Saved Successful'
-                    );
-                },
-                complete: function () {
-                    UIElements.btnSave.prop('disabled', false);
-                }
-            }
-        );
-    }
-
-    function handleReset() {
-        $(intakeMapColumn).empty();
-        $(worksheetMapColumn).empty();
-        let availableChefsFields = availableChefFieldsString ? JSON.parse(availableChefFieldsString) : []
-        initializeIntakeMap(availableChefsFields);
-        bindExistingMaps();
-    }
-
-
-    function createIntakeFieldCard(intakeField) {
-        let intakeFieldJson = intakeField;
-        let dragableDiv = document.createElement('div');
-        dragableDiv.id = 'unity_' + intakeFieldJson.Name;
-        dragableDiv.className = 'card mapping-field';
-        dragableDiv.setAttribute("draggable", "true");
-
-        // Set icon HTML (internal code, safe)
-        dragableDiv.innerHTML = `${setTypeIndicator(intakeField)}`;
-
-        // Append label as text node to prevent HTML injection
-        dragableDiv.appendChild(document.createTextNode(intakeFieldJson.Label));
-
-        // Append asterisk and route to the appropriate column based on custom status
-        if (intakeFieldJson.IsCustom) {
-            dragableDiv.appendChild(document.createTextNode(" *"));
-            dragableDiv.className += ' custom-field';
-            worksheetMapColumn.appendChild(dragableDiv);
-        } else {
-            intakeMapColumn.appendChild(dragableDiv);
-        }
-    }
-
-    function buildAvailableChefsFieldsRows(availableChefsFields) {
-        let rowsToAdd = [];
-        for (let key of Object.keys(availableChefsFields)) {
-            let jsonObj = JSON.parse(availableChefsFields[key]);
-            if (allowableTypes.has(jsonObj.type.trim())) {
-                rowsToAdd.push([stripHtml(jsonObj.label), key, jsonObj.type, key]);
-            }
-        }
-        return rowsToAdd;
-    }
-
-    function initializeIntakeMap(availableChefsFields) {
-        try {
-
-            let intakeFields = JSON.parse(intakeFieldsString);
-
-            for (let intakeField of intakeFields) {
-                if (!excludedIntakeMappings.has(intakeField.Name)) {
-                    createIntakeFieldCard(intakeField);
-                }
-            }
-
-            dataTable.clear();
-
-            let rowsToAdd = buildAvailableChefsFieldsRows(availableChefsFields);
-
-            if (rowsToAdd.length > 0) {
-                dataTable.rows.add(rowsToAdd);
-            }
-            dataTable.draw();
-        }
-        catch (err) {
-            console.info('Mapping error: ' + err);
-        }
-    }
-
-
-    document.addEventListener('dragstart', function (ev) {
-        if (ev.target.classList.contains('non-drag')) {
-            ev.preventDefault();
-            return;
-        } else if (ev.target.classList.contains('custom-field')) {
-            UIElements.customFieldsTab.trigger('click');
-        } else if (!ev.target.classList.contains('custom-field')) {
-            UIElements.intakeFieldsTab.trigger('click');
-        }
-        beingDragged(ev);
-    });
-
-    document.addEventListener('dragend', function (ev) {
-        if (ev.target.classList.contains('non-drag')) {
-            ev.preventDefault();
-            return;
-        }
-        dragEnd(ev);
-    });
-
-    document.addEventListener('dragover', function (event) {
-        let beingDragged = document.querySelector('.dragging');
-        if (event.target.matches('.card')) {
-            if (beingDragged.classList.contains('card')) {
-                allowDrop(event);
-            }
-        }
-        if (event.target.matches('.col')) {
-            if (beingDragged.classList.contains('card')) {
-                colDraggedOver(event);
-            }
-            if (beingDragged.classList.contains('col')) {
-                allowDrop(event);
-            }
-        }
-    });
-
-
-
-    function allowDrop(ev) {
-        ev.preventDefault();
-
-        let dragOver = ev.target;
-        let dragOverParent = dragOver.parentElement;
-        let beingDragged = document.querySelector('.dragging');
-        let draggedParent = beingDragged.parentElement;
-
-        let draggedIndex = whichChild(beingDragged);
-        let dragOverIndex = whichChild(dragOver);
-
-        if (draggedParent === dragOverParent) {
-            if (draggedIndex < dragOverIndex) {
-                beingDragged.before(dragOver);
-            } else if (draggedIndex > dragOverIndex) {
-                beingDragged.after(dragOver);
-            }
-        } else {
-            dragOver.before(beingDragged);
-        }
-    }
-
-    function colDraggedOver(event) {
-        let dragOver = event.target;
-        let beingDragged = document.querySelector('.dragging');
-        let draggedParent = beingDragged.parentElement;
-        if (
-            draggedParent.id !== dragOver.id &&
-            draggedParent.classList.contains('col') &&
-            dragOver.classList.contains('col')
-        ) {
-            if (dragOver.childElementCount == 0) {
-                dragOver.appendChild(beingDragged);
-            }
-        }
-    }
-
-
-
-
-
-
-    function handleMappingTabClick() {
-        // Refresh the hidden field with the latest form version ID
-        let refreshAvailableWorkSheets = UIElements.refreshAvailableWorksheetsHidden.val();
-        if (refreshAvailableWorkSheets && refreshAvailableWorkSheets !== "undefined") {
-            navigateToVersion(refreshAvailableWorkSheets);
-        }
-    }
-
-    PubSub.subscribe(
-        'refresh_available_worksheets',
-        (_, data) => {
-            UIElements.refreshAvailableWorksheetsHidden.val(data.chefsFormVersionId);
-        }
-    );
-});
-
-
-function handleBack() {
-    location.href = '/ApplicationForms';
-}
-
-function beingDragged(ev) {
-    let draggedEl = ev.target;
-    if (draggedEl.classList + "" !== "undefined") {
-        draggedEl.classList.add('dragging');
-    }
-}
-
-function dragEnd(ev) {
-    let draggedEl = ev.target;
-    if (draggedEl.classList + "" !== "undefined") {
-        draggedEl.classList.remove('dragging');
-    }
-}
+$(function () {
+    const aiL = abp.localization.getResource('AI');
+    let availableChefFieldsString = document.getElementById('availableChefsFields').value;
+    let existingMappingString = document.getElementById('existingMapping').value;
+    let intakeFieldsString = document.getElementById('intakeProperties').value;
+    let chefsFormId = document.getElementById('chefsFormId').value;
+    let formVersionId = document.getElementById('formVersionId').value;
+    let intakeMapColumn = document.querySelector('#intake-map-available-fields-column');
+    let worksheetMapColumn = document.querySelector('#worksheet-map-available-fields-column');
+    let excludedIntakeMappings = new Set(['ConfirmationId', 'SubmissionId', 'SubmissionDate']);
+    let dataTable;
+
+    let allowableTypes = new Set(['textarea',
+        'orgbook',
+        'textfield',
+        'currency',
+        'datetime',
+        'checkbox',
+        'select',
+        'selectboxes',
+        'radio',
+        'phoneNumber',
+        'email',
+        'number',
+        'time',
+        'day',
+        'hidden',
+        'simpletextfield',
+        'simpletextfieldadvanced',
+        'simpletime',
+        'simpletimeadvanced',
+        'simplenumber',
+        'simplenumberadvanced',
+        'simplephonenumber',
+        'simplephonenumberadvanced',
+        'simpleselect',
+        'simpleselectadvanced',
+        'simpleday',
+        'simpledayadvanced',
+        'simpleemail',
+        'simpleemailadvanced',
+        'simpledatetime',
+        'simpledatetimeadvanced',
+        'simpleurladvanced',
+        'simplecheckbox',
+        'simpleradios',
+        'simpleradioadvanced',
+        'simplecheckboxes',
+        'simplecheckboxadvanced',
+        'simplecurrencyadvanced',
+        'simpletextarea',
+        'simpletextareaadvanced',
+        'bcaddress',
+        'datagrid']);
+
+    const UIElements = {
+        btnBack: $('#btn-back'),
+        btnSave: $('#btn-save'),
+        btnEdit: $('#btn-edit'),
+        btnGenerate: $('#btn-generate'),
+        btnReviewMapping: $('#btn-review-mapping'),
+        btnGenerateWorksheet: $('#btn-generate-worksheet'),
+        btnGenerateScoresheet: $('#btn-generate-scoresheet'),
+        btnReviewWorksheet: $('#btn-review-worksheet'),
+        scoresheetReviewModal: $('#aiScoresheetReviewModal'),
+        scoresheetReviewFields: $('#aiScoresheetReviewFields'),
+        scoresheetReviewEmpty: $('#aiScoresheetReviewEmpty'),
+        scoresheetReviewSelectAll: $('#aiScoresheetReviewSelectAll'),
+        scoresheetTitle: $('#aiScoresheetTitle'),
+        btnCreateScoresheetDraft: $('#btn-create-ai-scoresheet-draft'),
+        btnDiscardScoresheet: $('#btn-discard-ai-scoresheet'),
+        btnPublishAssignWorksheets: $('#btn-publish-assign-worksheets'),
+        btnGenerateFinalMapping: $('#btn-generate-final-mapping'),
+        btnReviewFinalMapping: $('#btn-review-final-mapping'),
+        btnRestartAiFlow: $('#btn-restart-ai-flow'),
+        worksheetReviewModal: $('#aiWorksheetReviewModal'),
+        mappingReviewModal: $('#aiMappingReviewModal'),
+        mappingReviewFields: $('#aiMappingReviewFields'),
+        mappingReviewEmpty: $('#aiMappingReviewEmpty'),
+        mappingReviewSelectAll: $('#aiMappingReviewSelectAll'),
+        btnAddMapping: $('#btn-add-ai-mapping'),
+        btnReviewLaterMapping: $('#btn-review-later-ai-mapping'),
+        btnDiscardMapping: $('#btn-discard-ai-mapping'),
+        worksheetReviewFields: $('#aiWorksheetReviewFields'),
+        worksheetReviewEmpty: $('#aiWorksheetReviewEmpty'),
+        worksheetTitle: $('#aiWorksheetTitle'),
+        btnCreateWorksheetDraft: $('#btn-create-ai-worksheet-draft'),
+        btnDiscardWorksheet: $('#btn-discard-ai-worksheet'),
+        btnSync: $('#btn-sync'),
+        btnReset: $('#btn-reset'),
+        btnClose: $('.btn-close'),
+        btnSaveMapping: $('#btn-save-mapping'),
+        btnCancel: $('#btn-cancel-mapping'),
+        inputSearchBar: $('#search-bar'),
+        selectVersionList: $('#applicationFormVersion'),
+        editMappingModal: $('#editMappingModal'),
+        uiConfigurationTab: $('#nav-ui-configuration'),
+        mappingTab: $('#nav-mapping-tab'),
+        customFieldsTab: $('#nav-worksheet-fields-tab'),
+        intakeFieldsTab: $('#nav-intake-fields-tab'),
+        refreshAvailableWorksheetsHidden: $('#refresh_available_worksheets')
+    };
+
+    const reviewConfigs = {
+        mapping: {
+            modal: UIElements.mappingReviewModal,
+            fields: UIElements.mappingReviewFields,
+            empty: UIElements.mappingReviewEmpty,
+            primary: UIElements.btnAddMapping,
+            later: UIElements.btnReviewLaterMapping,
+            discard: UIElements.btnDiscardMapping,
+            emptyMessage: 'No new mappings were suggested.',
+            emptyPrimaryText: 'Continue to Worksheets',
+            primaryText: 'Add selected to map',
+            continueReview: function () {
+                UIElements.mappingReviewModal.modal('hide');
+                loadMappingReview(false);
+            }
+        },
+        worksheet: {
+            modal: UIElements.worksheetReviewModal,
+            fields: UIElements.worksheetReviewFields,
+            empty: UIElements.worksheetReviewEmpty,
+            primary: UIElements.btnCreateWorksheetDraft,
+            later: $('#btn-review-later-ai-worksheet'),
+            discard: UIElements.btnDiscardWorksheet,
+            emptyMessage: 'No additional worksheet fields were suggested.',
+            emptyPrimaryText: 'Finish',
+            primaryText: 'Create Draft',
+            continueReview: function () {
+                setAiWorksheetPending(false);
+                UIElements.worksheetReviewModal.modal('hide');
+                loadMappingReview(false);
+            }
+        },
+        scoresheet: {
+            modal: UIElements.scoresheetReviewModal,
+            fields: UIElements.scoresheetReviewFields,
+            empty: UIElements.scoresheetReviewEmpty,
+            primary: UIElements.btnCreateScoresheetDraft,
+            later: $('#btn-review-later-ai-scoresheet'),
+            discard: UIElements.btnDiscardScoresheet,
+            emptyMessage: 'No additional scoresheet questions were suggested.',
+            emptyPrimaryText: 'Finish',
+            primaryText: 'Add to Scoresheet',
+            continueReview: function () {
+                const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+                abp.ajax({
+                    url: `/api/app/application-form-version/discard-ai-scoresheet-suggestions?formVersionId=${encodeURIComponent(formVersion)}`,
+                    type: 'POST'
+                }).done(function () {
+                    setAiScoresheetPending(false);
+                    UIElements.scoresheetReviewModal.modal('hide');
+                    loadMappingReview(false);
+                }).fail(function () {
+                    reviewConfigs.scoresheet.primary.prop('disabled', false);
+                    abp.notify.error('', 'Unable to finish the scoresheet review.');
+                });
+            }
+        }
+    };
+
+    init();
+
+    function init() {
+        bindUIEvents();
+        restoreActiveTab();
+        dataTable = initializeApplicationFormsTable();
+        let availableChefsFields = availableChefFieldsString ? JSON.parse(availableChefFieldsString) : []
+        initializeIntakeMap(availableChefsFields);
+        bindExistingMaps();
+        setupTooltips();
+        initializeUIConfiguration();
+        loadMappingReview(false);
+        loadAiScoresheetReview(false);
+    }
+
+    function setupTooltips() {
+        $('[data-toggle="tooltip"]').tooltip({
+            placement: 'top'
+        });
+    }
+
+    function startWorksheetPhase(callback) {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        return abp.ajax({
+            url: `/api/app/application-form-version/mapping-review-phase?formVersionId=${encodeURIComponent(formVersion)}&phase=WorksheetReview`,
+            type: 'POST'
+        }).done(callback).fail(function () {
+            abp.notify.error('', 'Unable to start worksheet generation.');
+        });
+    }
+
+    function bindUIEvents() {
+        UIElements.btnBack.on('click', handleBack);
+        UIElements.btnSave.on('click', handleSave);
+        UIElements.btnSaveMapping.on('click', handleSaveEditMapping);
+        UIElements.btnSync.on('click', handleSync);
+        UIElements.btnEdit.on('click', handleEdit);
+        UIElements.btnGenerate.on('click', queueFormMapping);
+        UIElements.btnReviewMapping.on('click', function () {
+            loadMappingReview(true);
+        });
+        UIElements.btnReviewFinalMapping.on('click', function () {
+            loadMappingReview(true);
+        });
+        UIElements.btnGenerateWorksheet.on('click', queueFormWorksheet);
+        UIElements.btnGenerateFinalMapping.on('click', finalizeMappingReview);
+        UIElements.btnRestartAiFlow.on('click', restartAiFlow);
+        UIElements.btnGenerateScoresheet.on('click', function () {
+            if (UIElements.btnGenerateScoresheet.attr('data-ai-pending') === 'true') {
+                loadAiScoresheetReview(true);
+                return;
+            }
+
+            if (UIElements.btnGenerateScoresheet.attr('data-ai-can-generate') !== 'true') {
+                abp.notify.error('', aiL('AI:GenerateFormScoresheetPermissionRequired'));
+                return;
+            }
+
+            queueFormScoresheet(this);
+        });
+        UIElements.btnCreateScoresheetDraft.on('click', function () {
+            if (UIElements.btnCreateScoresheetDraft.attr('data-empty-confirmation') === 'true') {
+                continueEmptyReview(reviewConfigs.scoresheet);
+                return;
+            }
+            createAiScoresheetDraft();
+        });
+        UIElements.btnDiscardScoresheet.on('click', discardAiScoresheetSuggestions);
+        UIElements.scoresheetReviewFields.on('change', 'input[data-question-id]', updateAiScoresheetReview);
+        UIElements.scoresheetReviewFields.on('change', 'input[data-section-id]', toggleAiScoresheetSection);
+        UIElements.scoresheetReviewSelectAll.on('change', toggleAiScoresheetReviewAll);
+        UIElements.scoresheetTitle.on('input', updateAiScoresheetDraftButton);
+        UIElements.btnReviewWorksheet.on('click', loadAiWorksheetReview);
+        UIElements.btnAddMapping.on('click', function () {
+            if (UIElements.btnAddMapping.attr('data-empty-confirmation') === 'true') {
+                continueEmptyReview(reviewConfigs.mapping);
+                return;
+            }
+            addSelectedMappingSuggestion();
+        });
+        UIElements.btnReviewLaterMapping.on('click', function () {
+            UIElements.mappingReviewModal.modal('hide');
+        });
+        UIElements.btnDiscardMapping.on('click', discardMappingSuggestions);
+        UIElements.mappingReviewFields.on('change', 'input[data-suggestion-id]', updateMappingReviewSelection);
+        UIElements.mappingReviewSelectAll.on('change', toggleMappingReviewAll);
+        UIElements.btnCreateWorksheetDraft.on('click', function () {
+            if (UIElements.btnCreateWorksheetDraft.attr('data-empty-confirmation') === 'true') {
+                continueEmptyReview(reviewConfigs.worksheet);
+                return;
+            }
+            createAiWorksheetDraft();
+        });
+        UIElements.btnDiscardWorksheet.on('click', discardAiWorksheetSuggestions);
+        UIElements.worksheetReviewFields.on('change', 'input[data-field-id]', updateAiWorksheetReview);
+        $('#aiWorksheetReviewSelectAll').on('change', toggleAiWorksheetReviewAll);
+        UIElements.worksheetTitle.on('input', updateAiWorksheetDraftButton);
+        UIElements.btnReset.on('click', handleReset);
+        UIElements.btnCancel.on('click', handleCancelMapping);
+        UIElements.btnClose.on('click', handleCancelMapping);
+        UIElements.inputSearchBar.on('keyup', handleSeearchBar);
+        UIElements.selectVersionList.on('change', handleSelectVersion);
+        UIElements.mappingTab.on('click', handleMappingTabClick);
+
+        // Persist active tab to localStorage on switch
+        $('#nav-tab').on('shown.bs.tab', 'button[data-bs-toggle="tab"]', function () {
+            const formId = document.getElementById('applicationFormId')?.value;
+            if (formId) {
+                localStorage.setItem('mapping-active-tab:' + formId, this.id);
+            }
+        });
+    }
+
+    function restoreActiveTab() {
+        const formId = document.getElementById('applicationFormId')?.value;
+        if (!formId) return;
+        const savedTabId = localStorage.getItem('mapping-active-tab:' + formId);
+        if (!savedTabId) return;
+        const tabEl = document.getElementById(savedTabId);
+        if (tabEl) {
+            bootstrap.Tab.getOrCreateInstance(tabEl).show();
+        }
+    }
+
+    function initializeUIConfiguration() {
+        const providerName = 'F';
+        const providerKey = $('#applicationFormId').val();
+        const providerKeyDisplayName = 'Test.Display.Name';
+
+        $.ajax({
+            url: abp.appPath + 'SettingManagement/ZoneManagement',
+            type: 'GET',
+            data: {
+                providerName: providerName,
+                providerKey: providerKey,
+                providerKeyDisplayName: providerKeyDisplayName
+            },
+            success: function (response) {
+                UIElements.uiConfigurationTab.html(response);
+            },
+            error: function () {
+                abp.notify.error('Failed to load UI Configuration.');
+            }
+        });
+    }
+
+    function handleEdit() {
+        $('#jsonText').val(prettyJson(existingMappingString));
+        UIElements.editMappingModal.addClass('display-modal');
+    }
+
+    function queueFormMapping(triggerButton = null) {
+        if (UIElements.btnGenerate.attr('data-ai-pending') === 'true') {
+            loadMappingReview(true);
+            return;
+        }
+
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            abp.notify.error('', 'The Form Version ID is not in a GUID format');
+            return;
+        }
+        if (!validateGuid(applicationId)) {
+            abp.notify.error('', 'The Application ID is not in a GUID format');
+            return;
+        }
+
+        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerate?.get?.(0);
+        const $button = $(buttonElement);
+        const existingHtml = $button.html();
+
+        if ($button.attr('data-ai-pending') === 'true') {
+            loadAiScoresheetReview(true);
+            return;
+        }
+
+        if ($button.prop('disabled')) {
+            return;
+        }
+
+        globalThis.AIGenerationButtonState?.setGenerating($button);
+
+        abp.ajax({
+            url: `/api/app/ai/generation/form-mapping?applicationId=${encodeURIComponent(applicationId)}&applicationFormVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'POST',
+        })
+            .done(function (generationStatus) {
+                const request = generationStatus?.generationRequest;
+                const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
+
+                if (status === 'Completed') {
+                    globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                    globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
+                    refreshMappingAfterGeneration(applicationId, formVersion);
+                    return;
+                }
+
+                monitorFormMappingGeneration(applicationId, $button, existingHtml);
+            })
+            .fail(function (error) {
+                if (globalThis.AIGenerationButtonState?.handleQueueFailure(error)) {
+                    return;
+                }
+
+                abp.message.error('Failed to queue AI mapping generation. Please try again.');
+                restoreGenerateMappingButton($button, existingHtml);
+                globalThis.syncAIRateLimitButtons?.();
+            });
+    }
+
+    function queueFormWorksheet(triggerButton = null) {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
+        if (!validateGuid(formVersion) || !validateGuid(applicationId)) {
+            abp.notify.error('', 'The Form Version ID or Application ID is not in a GUID format');
+            return;
+        }
+
+        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerateWorksheet?.get?.(0);
+
+        if (isAiWorksheetPending()) {
+            loadAiWorksheetReview();
+            return;
+        }
+
+        startWorksheetPhase(function () {
+            queueFormWorksheetCore(buttonElement);
+        });
+    }
+
+    function queueFormWorksheetCore(triggerButton = null) {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
+        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerateWorksheet?.get?.(0);
+        const $button = $(buttonElement);
+        const existingHtml = $button.html();
+
+        globalThis.AIGenerationButtonState?.setGenerating($button);
+
+        abp.ajax({
+            url: `/api/app/ai/generation/form-worksheet?applicationId=${encodeURIComponent(applicationId)}&applicationFormVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'POST',
+        })
+            .done(function (generationStatus) {
+                const request = generationStatus?.generationRequest;
+                const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
+                if (status === 'Completed') {
+                    globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                    globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
+                    refreshWorksheetAfterGeneration();
+                    return;
+                }
+
+                monitorFormWorksheetGeneration(applicationId, $button, existingHtml);
+            })
+            .fail(function (error) {
+                if (globalThis.AIGenerationButtonState?.handleQueueFailure(error)) {
+                    return;
+                }
+
+                abp.message.error('Failed to queue AI worksheet generation. Please try again.');
+                restoreGenerateWorksheetButton($button, existingHtml);
+                globalThis.syncAIRateLimitButtons?.();
+            });
+    }
+
+    function monitorFormWorksheetGeneration(applicationId, $button, existingHtml) {
+        globalThis.AIGenerationButtonState?.monitor({
+            $button,
+            originalHtml: existingHtml,
+            getStatus: () => abp.ajax({
+                url: `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=form-worksheet`,
+                type: 'GET'
+            }),
+            onComplete: function () {
+                refreshWorksheetAfterGeneration();
+            },
+            onFailed: function (request) {
+                abp.message.error(request?.failureReason || 'AI worksheet generation failed.');
+            },
+            onPollFailed: function () {
+                abp.message.error('Unable to load AI worksheet generation status. Please try again.');
+            }
+        });
+    }
+
+    function queueFormScoresheet(triggerButton = null) {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
+        if (!validateGuid(formVersion) || !validateGuid(applicationId)) {
+            abp.notify.error('', 'The Form Version ID or Application ID is not in a GUID format');
+            return;
+        }
+
+        const buttonElement = triggerButton?.currentTarget || triggerButton?.target || triggerButton || UIElements.btnGenerateScoresheet?.get?.(0);
+        const $button = $(buttonElement);
+        const existingHtml = $button.html();
+
+        if ($button.prop('disabled')) {
+            return;
+        }
+
+        globalThis.AIGenerationButtonState?.setGenerating($button);
+
+        abp.ajax({
+            url: `/api/app/ai/generation/form-scoresheet?applicationId=${encodeURIComponent(applicationId)}&applicationFormVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'POST',
+        })
+            .done(function (generationStatus) {
+                const request = generationStatus?.generationRequest;
+                const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
+                if (status === 'Completed') {
+                    globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                    globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
+                    refreshScoresheetAfterGeneration();
+                    return;
+                }
+
+                monitorFormScoresheetGeneration(applicationId, $button, existingHtml);
+            })
+            .fail(function (error) {
+                if (globalThis.AIGenerationButtonState?.handleQueueFailure(error)) {
+                    return;
+                }
+
+                abp.message.error('Failed to queue AI scoresheet generation. Please try again.');
+                restoreGenerateScoresheetButton($button, existingHtml);
+                globalThis.syncAIRateLimitButtons?.();
+            });
+    }
+
+    function monitorFormScoresheetGeneration(applicationId, $button, existingHtml) {
+        globalThis.AIGenerationButtonState?.monitor({
+            $button,
+            originalHtml: existingHtml,
+            getStatus: () => abp.ajax({
+                url: `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=form-scoresheet`,
+                type: 'GET'
+            }),
+            onComplete: function () {
+                refreshScoresheetAfterGeneration();
+            },
+            onFailed: function (request) {
+                abp.message.error(request?.failureReason || 'AI scoresheet generation failed.');
+            },
+            onPollFailed: function () {
+                abp.message.error('Unable to load AI scoresheet generation status. Please try again.');
+            }
+        });
+    }
+
+    function refreshWorksheetAfterGeneration() {
+        setAiWorksheetPending(true);
+        loadAiWorksheetReview();
+    }
+
+    function isAiWorksheetPending() {
+        return UIElements.btnGenerateWorksheet.attr('data-ai-pending') === 'true';
+    }
+
+    function setAiWorksheetPending(isPending) {
+        UIElements.btnGenerateWorksheet
+            .attr('data-ai-pending', isPending ? 'true' : 'false')
+            .toggleClass('d-none', isPending);
+        UIElements.btnReviewWorksheet.toggleClass('d-none', !isPending);
+
+        if (!isPending) {
+            globalThis.syncAIRateLimitButtons?.();
+        }
+    }
+
+    function loadAiWorksheetReview() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            abp.notify.error('', 'Unable to review the worksheet because the Form Version ID is invalid.');
+            return;
+        }
+
+        abp.ajax({
+            url: `/api/app/application-form-version/pending-ai-worksheet?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'GET'
+        })
+            .done(function (worksheet) {
+                if (!worksheet) {
+                    setAiWorksheetPending(false);
+                    loadMappingReview(false).done(function (review) {
+                        if (review?.noWorksheetSuggestionsGenerated) {
+                            showEmptyReviewConfirmation(reviewConfigs.worksheet);
+                        } else {
+                            abp.notify.error('', 'The pending AI worksheet is no longer available.');
+                        }
+                    });
+                    return;
+                }
+
+                setAiWorksheetPending(true);
+                renderAiWorksheetReview(worksheet);
+                UIElements.worksheetReviewModal.modal('show');
+            })
+            .fail(function () {
+                abp.notify.error('', 'Unable to load the pending AI worksheet.');
+            });
+    }
+
+    function renderAiWorksheetReview(worksheet) {
+        resetEmptyReviewModal(reviewConfigs.worksheet);
+        UIElements.worksheetReviewFields.empty();
+
+        const fields = worksheet.fields || [];
+        fields.forEach(function (field) {
+            const fieldId = `ai-worksheet-field-${field.id}`;
+            const $row = $('<div class="ai-suggestion-review__field"></div>');
+            $('<span class="ai-suggestion-review__field-name"></span>')
+                .attr('data-field-role', 'Source')
+                .text(field.key || '—')
+                .appendTo($row);
+            $('<i class="fa-solid fa-arrow-right ai-suggestion-review__arrow" aria-hidden="true"></i>').appendTo($row);
+            $('<span class="ai-suggestion-review__field-name"></span>')
+                .attr('data-field-role', 'Worksheet')
+                .text(field.label || field.key || '—')
+                .appendTo($row);
+            const $switch = $('<div class="ai-suggestion-review__switch"></div>');
+            const $switchContainer = $('<div class="form-check unt-form-switch form-switch mb-0"></div>');
+            $('<input class="form-check-input" type="checkbox">')
+                .attr('id', fieldId)
+                .attr('data-field-id', field.id)
+                .attr('aria-label', `Include ${field.label || field.key || 'field'}`)
+                .prop('checked', field.selected !== false)
+                .appendTo($switchContainer);
+            $switchContainer.appendTo($switch);
+            $switch.appendTo($row);
+            $row.appendTo(UIElements.worksheetReviewFields);
+        });
+
+        UIElements.worksheetReviewFields.attr('data-session-id', worksheet.sessionId);
+        UIElements.worksheetReviewEmpty.toggleClass('d-none', fields.length > 0);
+        updateAiWorksheetReview();
+    }
+
+    function updateAiWorksheetReview() {
+        const $fields = UIElements.worksheetReviewFields.find('input[data-field-id]');
+        const selectedCount = $fields.filter(':checked').length;
+        $('#aiWorksheetReviewSelectAll')
+            .prop('checked', $fields.length > 0 && selectedCount === $fields.length)
+            .prop('indeterminate', false);
+        updateAiWorksheetDraftButton();
+    }
+
+    function toggleAiWorksheetReviewAll() {
+        UIElements.worksheetReviewFields.find('input[data-field-id]').prop('checked', $(this).prop('checked'));
+        updateAiWorksheetReview();
+    }
+
+    function updateAiWorksheetDraftButton() {
+        const hasTitle = String(UIElements.worksheetTitle.val() ?? '').trim().length > 0;
+        const hasSelectedFields = UIElements.worksheetReviewFields.find('input[data-field-id]:checked').length > 0;
+        UIElements.btnCreateWorksheetDraft.prop('disabled', !hasTitle || !hasSelectedFields);
+    }
+
+    function createAiWorksheetDraft() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const sessionId = UIElements.worksheetReviewFields.attr('data-session-id');
+        const title = String(UIElements.worksheetTitle.val() ?? '').trim();
+        const selectedFieldIds = UIElements.worksheetReviewFields
+            .find('input[data-field-id]:checked')
+            .map(function () { return $(this).attr('data-field-id'); })
+            .get();
+
+        if (!validateGuid(formVersion) || !validateGuid(sessionId) || !title || selectedFieldIds.length === 0) {
+            abp.notify.error('', 'Enter a worksheet title and select at least one suggested field.');
+            return;
+        }
+
+        UIElements.btnCreateWorksheetDraft.prop('disabled', true);
+        UIElements.btnDiscardWorksheet.prop('disabled', true);
+
+        abp.ajax({
+            url: `/api/app/application-form-version/create-ai-worksheet-draft?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'POST',
+            contentType: 'application/json',
+            data: JSON.stringify({ sessionId, title, selectedFieldIds })
+        })
+            .done(function () {
+                UIElements.worksheetTitle.val('');
+                abp.notify.success('', 'Draft worksheet created.');
+                refreshAiWorksheetReviewAfterDraftCreation(formVersion);
+            })
+            .fail(function () {
+                abp.notify.error('', 'Unable to create the draft worksheet.');
+            })
+            .always(function () {
+                UIElements.btnDiscardWorksheet.prop('disabled', false);
+                updateAiWorksheetDraftButton();
+            });
+    }
+
+    function refreshAiWorksheetReviewAfterDraftCreation(formVersion) {
+        abp.ajax({
+            url: `/api/app/application-form-version/pending-ai-worksheet?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'GET'
+        })
+            .done(function (worksheet) {
+                if (!worksheet) {
+                    UIElements.worksheetReviewModal.modal('hide');
+                    setAiWorksheetPending(false);
+                    offerFinalMappingGeneration();
+                    return;
+                }
+
+                renderAiWorksheetReview(worksheet);
+            })
+            .fail(function () {
+                abp.notify.error('', 'Draft created, but the remaining suggestions could not be loaded.');
+            });
+    }
+
+    function discardAiWorksheetSuggestions() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion) || !isAiWorksheetPending()) {
+            return;
+        }
+
+        abp.message.confirm(
+            'This will permanently remove the remaining AI field suggestions.',
+            'Discard remaining suggestions?')
+            .then(function (confirmed) {
+                if (!confirmed) {
+                    return;
+                }
+
+                UIElements.btnCreateWorksheetDraft.prop('disabled', true);
+                UIElements.btnDiscardWorksheet.prop('disabled', true);
+                abp.ajax({
+                    url: `/api/app/application-form-version/discard-ai-worksheet-suggestions?formVersionId=${encodeURIComponent(formVersion)}`,
+                    type: 'POST'
+                })
+                    .done(function () {
+                        setAiWorksheetPending(false);
+                        UIElements.worksheetReviewModal.modal('hide');
+                        loadMappingReview(false);
+                        loadAiScoresheetReview(false);
+                    })
+                    .fail(function () {
+                        abp.notify.error('', 'Unable to discard the remaining AI worksheet suggestions.');
+                    })
+                    .always(function () {
+                        UIElements.btnDiscardWorksheet.prop('disabled', false);
+                        updateAiWorksheetDraftButton();
+                    });
+            });
+    }
+
+    function offerFinalMappingGeneration() {
+        UIElements.mappingReviewModal.modal('hide');
+        abp.notify.success('', 'Publish and assign the worksheet drafts, then return here to generate mapping.');
+        loadMappingReview(false);
+        loadAiScoresheetReview(false);
+    }
+
+    function finalizeMappingReview() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const applicationId = String(document.getElementById('applicationFormId')?.value ?? '').trim();
+        abp.ajax({
+            url: `/api/app/application-form-version/finalize-mapping-review?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'POST'
+        }).done(function () {
+            monitorFormMappingGeneration(applicationId, UIElements.btnGenerate, UIElements.btnGenerate.html());
+        }).fail(function (error) {
+            abp.notify.error('', error?.responseJSON?.error?.message || 'Publish and assign all AI worksheet drafts before generating mapping.');
+            loadMappingReview(false);
+        });
+    }
+
+    function checkMappingReviewComplete() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        abp.ajax({
+            url: `/api/app/application-form-version/mapping-review?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'GET'
+        }).done(function (review) {
+            if (!review?.pendingSuggestions?.length) {
+                UIElements.mappingReviewModal.modal('hide');
+                if (isFinalMappingPhase(review.phase)) {
+                    completeMappingReview();
+                } else {
+                    offerWorksheetGeneration();
+                }
+            }
+        });
+    }
+
+    function completeMappingReview() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        abp.ajax({
+            url: `/api/app/application-form-version/mapping-review-phase?formVersionId=${encodeURIComponent(formVersion)}&phase=Completed`,
+            type: 'POST'
+        }).done(function () {
+            UIElements.btnGenerate.attr('data-ai-pending', 'false');
+            abp.notify.success('', 'AI mapping review completed.');
+        });
+    }
+
+    function isFinalMappingPhase(phase) {
+        return phase === 'FinalMappingReview' || phase === 2 || phase === '2';
+    }
+
+    function refreshScoresheetAfterGeneration() {
+        setAiScoresheetPending(true);
+        loadAiScoresheetReview(true);
+    }
+
+    function setAiScoresheetPending(isPending) {
+        UIElements.btnGenerateScoresheet
+            .attr('data-ai-pending', isPending ? 'true' : 'false');
+        UIElements.btnGenerateScoresheet.find('.ai-button-content span:last-child').text(
+            isPending ? 'Review Scoresheet' : 'Generate Scoresheet');
+
+        if (isPending) {
+            UIElements.btnGenerateScoresheet
+                .removeAttr('data-ai-cooldown-checking data-ai-rate-limit-disabled')
+                .prop('disabled', false);
+        }
+    }
+
+    function loadAiScoresheetReview(showModal = true, showEmpty = true) {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            return;
+        }
+
+        return abp.ajax({
+            url: `/api/app/application-form-version/pending-ai-scoresheet?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'GET'
+        }).done(function (review) {
+            if (!review) {
+                setAiScoresheetPending(false);
+                if (showModal && showEmpty) {
+                    showEmptyReviewConfirmation(reviewConfigs.scoresheet);
+                } else {
+                    UIElements.scoresheetReviewModal.modal('hide');
+                }
+                return;
+            }
+
+            setAiScoresheetPending(true);
+            renderAiScoresheetReview(review);
+            if (showModal) {
+                const hasQuestions = (review.sections || []).some(section => (section.questions || []).length > 0);
+                if (hasQuestions) {
+                    UIElements.scoresheetReviewModal.modal('show');
+                } else if (showEmpty) {
+                    showEmptyReviewConfirmation(reviewConfigs.scoresheet);
+                } else {
+                    UIElements.scoresheetReviewModal.modal('hide');
+                }
+            }
+        }).fail(function () {
+            if (showModal) {
+                abp.notify.error('', 'Unable to load AI scoresheet suggestions.');
+            }
+        });
+    }
+
+    function renderAiScoresheetReview(review) {
+        resetEmptyReviewModal(reviewConfigs.scoresheet);
+        UIElements.scoresheetReviewFields.empty();
+        UIElements.scoresheetReviewSelectAll.prop('checked', false);
+        UIElements.scoresheetTitle.val(review.title || '');
+        UIElements.scoresheetReviewFields.attr('data-session-id', review.sessionId || '');
+
+        const sections = review.sections || [];
+        UIElements.scoresheetReviewEmpty.toggle(sections.length === 0);
+        sections.forEach(function (section) {
+            const $section = $('<div/>', { class: 'ai-suggestion-review__section' });
+            const $header = $('<div/>', { class: 'ai-suggestion-review__section-header' });
+            $('<span/>', { text: section.name || 'Section' }).appendTo($header);
+            const $sectionToggle = $('<div/>', { class: 'form-check unt-form-switch form-switch mb-0', title: 'Include all questions in this section' });
+            $('<input/>', {
+                type: 'checkbox',
+                class: 'form-check-input',
+                'data-section-id': section.id,
+                'aria-label': `Include all questions in ${section.name || 'section'}`
+            }).appendTo($sectionToggle);
+            $sectionToggle.appendTo($header);
+            $section.append($header);
+
+            (section.questions || []).forEach(function (question) {
+                const $row = $('<div/>', { class: 'ai-suggestion-review__field' });
+                const $checkbox = $('<input/>', {
+                    type: 'checkbox',
+                    class: 'form-check-input',
+                    'data-question-id': question.id,
+                    'data-question-section-id': section.id,
+                    checked: question.selected !== false
+                });
+                $('<div/>', { class: 'ai-suggestion-review__source', text: question.label || question.name || '' }).appendTo($row);
+                if (!UIElements.scoresheetReviewModal.find('.ai-suggestion-review__panel').attr('data-hide-target-column')) {
+                    $('<div/>', { class: 'ai-suggestion-review__arrow', text: '→' }).appendTo($row);
+                }
+                if (!UIElements.scoresheetReviewModal.find('.ai-suggestion-review__panel').attr('data-hide-target-column')) {
+                    $('<div/>', { class: 'ai-suggestion-review__target', text: section.name || '' }).appendTo($row);
+                }
+                const $questionToggle = $('<div/>', { class: 'ai-suggestion-review__switch' });
+                const $questionSwitch = $('<div/>', { class: 'form-check unt-form-switch form-switch mb-0' });
+                $checkbox.appendTo($questionSwitch);
+                $questionSwitch.appendTo($questionToggle);
+                $questionToggle.appendTo($row);
+                $section.append($row);
+            });
+            UIElements.scoresheetReviewFields.append($section);
+        });
+
+        updateAiScoresheetReview();
+    }
+
+    function updateAiScoresheetReview() {
+        UIElements.scoresheetReviewFields.find('input[data-section-id]').each(function () {
+            const sectionId = $(this).attr('data-section-id');
+            const $questions = UIElements.scoresheetReviewFields.find('input[data-question-section-id]').filter(function () {
+                return $(this).attr('data-question-section-id') === sectionId;
+            });
+            $(this).prop('checked', $questions.length > 0 && $questions.filter(':checked').length === $questions.length);
+        });
+        const $questions = UIElements.scoresheetReviewFields.find('input[data-question-id]');
+        UIElements.scoresheetReviewSelectAll.prop('checked', $questions.length > 0 && $questions.filter(':checked').length === $questions.length);
+        updateAiScoresheetDraftButton();
+    }
+
+    function toggleAiScoresheetSection() {
+        const sectionId = $(this).attr('data-section-id');
+        const checked = $(this).prop('checked');
+        UIElements.scoresheetReviewFields.find('input[data-question-section-id]').filter(function () {
+            return $(this).attr('data-question-section-id') === sectionId;
+        }).prop('checked', checked);
+        updateAiScoresheetReview();
+    }
+
+    function toggleAiScoresheetReviewAll() {
+        UIElements.scoresheetReviewFields.find('input[data-question-id]').prop('checked', $(this).prop('checked'));
+        updateAiScoresheetReview();
+    }
+
+    function updateAiScoresheetDraftButton() {
+        const title = String(UIElements.scoresheetTitle.val() || '').trim();
+        const selected = UIElements.scoresheetReviewFields.find('input[data-question-id]:checked').length;
+        UIElements.btnCreateScoresheetDraft.prop('disabled', !title || selected === 0);
+    }
+
+    function createAiScoresheetDraft() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const sessionId = String(UIElements.scoresheetReviewFields.attr('data-session-id') || '').trim();
+        const title = String(UIElements.scoresheetTitle.val() || '').trim();
+        const selectedQuestionIds = UIElements.scoresheetReviewFields.find('input[data-question-id]:checked').map(function () {
+            return $(this).attr('data-question-id');
+        }).get();
+        if (!validateGuid(formVersion) || !validateGuid(sessionId) || !title || selectedQuestionIds.length === 0) {
+            updateAiScoresheetDraftButton();
+            return;
+        }
+
+        UIElements.btnCreateScoresheetDraft.prop('disabled', true);
+        abp.ajax({
+            url: `/api/app/application-form-version/create-ai-scoresheet-draft?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'POST',
+            contentType: 'application/json',
+            data: JSON.stringify({ sessionId: sessionId, title: title, selectedQuestionIds: selectedQuestionIds })
+        }).done(function () {
+            abp.notify.success('', 'Scoresheet draft created.');
+            loadAiScoresheetReview(true, false);
+        }).fail(function (error) {
+            abp.notify.error('', error?.responseJSON?.error?.message || 'Unable to create the scoresheet draft.');
+            updateAiScoresheetDraftButton();
+        });
+    }
+
+    function discardAiScoresheetSuggestions() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            return;
+        }
+        abp.message.confirm('This will permanently remove the remaining AI scoresheet suggestions.', 'Discard remaining suggestions?')
+            .then(function (confirmed) {
+                if (!confirmed) return;
+                UIElements.btnDiscardScoresheet.prop('disabled', true);
+                abp.ajax({
+                    url: `/api/app/application-form-version/discard-ai-scoresheet-suggestions?formVersionId=${encodeURIComponent(formVersion)}`,
+                    type: 'POST'
+                }).done(function () {
+                    setAiScoresheetPending(false);
+                    UIElements.scoresheetReviewModal.modal('hide');
+                    abp.notify.success('', 'Remaining AI scoresheet suggestions discarded.');
+                }).fail(function () {
+                    abp.notify.error('', 'Unable to discard the remaining AI scoresheet suggestions.');
+                }).always(function () {
+                    UIElements.btnDiscardScoresheet.prop('disabled', false);
+                });
+            });
+    }
+
+    function monitorFormMappingGeneration(applicationId, $button, existingHtml) {
+        globalThis.AIGenerationButtonState?.monitor({
+            $button,
+            originalHtml: existingHtml,
+            getStatus: () => abp.ajax({
+                url: `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=form-mapping`,
+                type: 'GET'
+            }),
+            onComplete: function () {
+                refreshMappingAfterGeneration(applicationId);
+            },
+            onFailed: function (request) {
+                abp.message.error(request?.failureReason || 'AI mapping generation failed.');
+            },
+            onPollFailed: function () {
+                abp.message.error('Unable to load AI mapping generation status. Please try again.');
+            }
+        });
+    }
+
+    function loadMappingReview(showModal = true) {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            return;
+        }
+
+        return abp.ajax({
+            url: `/api/app/application-form-version/mapping-review?formVersionId=${encodeURIComponent(formVersion)}`,
+            type: 'GET'
+        })
+            .done(function (review) {
+                setAiWorkflowReady();
+                updateWorkflowActions(review);
+                if (!review?.pendingSuggestions?.length) {
+                    if (showModal && (review?.noSuggestionsGenerated ||
+                        (review?.unchangedSuggestionCount > 0 && review?.state === 'Completed'))) {
+                        showEmptyReviewConfirmation(reviewConfigs.mapping);
+                        return;
+                    }
+                    if (review?.phase === 'PublishAndAssignWorksheets') {
+                        UIElements.btnGenerate.prop('disabled', !review.canGenerateFinalMapping);
+                    }
+                    return;
+                }
+
+                renderMappingReview(review);
+                if (showModal) {
+                    UIElements.mappingReviewModal.modal('show');
+                }
+            }).fail(function () {
+                setAiWorkflowReady();
+            });
+    }
+
+    function setAiWorkflowReady() {
+        $('.configuration-action-bar[data-ai-workflow-loading="true"]')
+            .attr('data-ai-workflow-loading', 'false');
+    }
+
+    function updateWorkflowActions(review) {
+        const action = getWorkflowAction(review);
+        const state = getWorkflowState(review);
+        const isInitial = action === 'GenerateInitialMapping';
+        const isInitialReview = action === 'ReviewInitialMapping';
+        const isGenerateWorksheets = action === 'GenerateWorksheets';
+        const isReviewWorksheets = action === 'ReviewWorksheets';
+        const isPublishAssign = action === 'PublishAndAssignWorksheets';
+        const isFinalMapping = action === 'GenerateFinalMapping';
+        const isFinalReview = action === 'ReviewFinalMapping';
+        const isCompleted = state === 'Completed';
+
+        UIElements.btnGenerate.toggleClass('d-none', !isInitial);
+        UIElements.btnReviewMapping.toggleClass('d-none', !isInitialReview);
+        UIElements.btnGenerateWorksheet.toggleClass('d-none', !isGenerateWorksheets);
+        UIElements.btnReviewWorksheet.toggleClass('d-none', !isReviewWorksheets);
+        UIElements.btnPublishAssignWorksheets.toggleClass('d-none', !isPublishAssign);
+        UIElements.btnGenerateFinalMapping.toggleClass('d-none', !isFinalMapping);
+        UIElements.btnReviewFinalMapping.toggleClass('d-none', !isFinalReview);
+        UIElements.btnRestartAiFlow.toggleClass('d-none', !isCompleted);
+        UIElements.btnGenerate.prop('disabled', !review?.actionEnabled && isInitial);
+        UIElements.btnGenerateFinalMapping.prop('disabled', !review?.actionEnabled);
+
+    }
+
+    function getWorkflowState(review) {
+        if (review?.state) {
+            return review.state;
+        }
+        return getEnumName(review?.workflowState, {
+            10: 'GenerateInitialMapping',
+            20: 'ReviewInitialMapping',
+            30: 'GenerateWorksheets',
+            40: 'ReviewWorksheets',
+            50: 'PublishAndAssignWorksheets',
+            60: 'GenerateFinalMapping',
+            70: 'ReviewFinalMapping',
+            80: 'Completed'
+        });
+    }
+
+    function getWorkflowAction(review) {
+        if (review?.action) {
+            return review.action;
+        }
+        return getEnumName(review?.workflowAction, {
+            10: 'GenerateInitialMapping',
+            20: 'ReviewInitialMapping',
+            30: 'GenerateWorksheets',
+            40: 'ReviewWorksheets',
+            50: 'PublishAndAssignWorksheets',
+            60: 'GenerateFinalMapping',
+            70: 'ReviewFinalMapping',
+            80: 'GenerateMapping',
+            90: 'GenerateWorksheetsNextCycle'
+        });
+    }
+
+    function getEnumName(value, numericNames) {
+        if (typeof value === 'string') {
+            return value;
+        }
+        return numericNames[String(value)] || '';
+    }
+
+    function renderMappingReview(review) {
+        resetEmptyReviewModal(reviewConfigs.mapping);
+        UIElements.mappingReviewFields.empty();
+        (review.pendingSuggestions || []).forEach(function (suggestion) {
+            const fieldId = `ai-mapping-field-${suggestion.id}`;
+            const $row = $('<div class="ai-suggestion-review__field"></div>');
+            $('<span class="ai-suggestion-review__field-name"></span>')
+                .attr('data-field-role', 'CHEFS field')
+                .text(suggestion.sourceField || '—')
+                .appendTo($row);
+            $('<i class="fa-solid fa-arrow-right ai-suggestion-review__arrow" aria-hidden="true"></i>').appendTo($row);
+            const $target = $('<span class="ai-suggestion-review__field-name"></span>')
+                .attr('data-field-role', 'Unity core field')
+                .text(suggestion.changeType === 'Changed'
+                    ? `${suggestion.previousTargetField || 'Unmapped'} → ${suggestion.targetField || '—'}`
+                    : suggestion.targetField || '—')
+                .appendTo($row);
+            if (suggestion.conflictSourceField) {
+                $('<small class="text-warning ai-suggestion-review__conflict d-block"></small>')
+                    .text(` Replaces mapping from ${suggestion.conflictSourceField}`)
+                    .appendTo($target);
+            }
+            const $switch = $('<div class="ai-suggestion-review__switch"></div>');
+            const $switchContainer = $('<div class="form-check unt-form-switch form-switch mb-0"></div>');
+            $('<input class="form-check-input" type="checkbox">')
+                .attr('id', fieldId)
+                .attr('data-suggestion-id', suggestion.id)
+                .attr('aria-label', `Include ${suggestion.sourceField || 'CHEFS field'} mapping suggestion`)
+                .prop('checked', false)
+                .appendTo($switchContainer);
+            $switchContainer.appendTo($switch);
+            $switch.appendTo($row);
+            $row.appendTo(UIElements.mappingReviewFields);
+        });
+        UIElements.mappingReviewEmpty.toggleClass('d-none', (review.pendingSuggestions || []).length > 0);
+        UIElements.mappingReviewFields.attr('data-phase', review.phase || '');
+        updateMappingReviewSelection();
+    }
+
+    function showEmptyReviewConfirmation(config) {
+        config.fields.empty().attr('data-empty-confirmation', 'true');
+        config.modal.attr('data-empty-confirmation', 'true');
+        config.modal.find('.ai-suggestion-review').attr('data-empty-confirmation', 'true');
+        config.empty.find('.ai-suggestion-review__empty-text').text(config.emptyMessage).removeClass('d-none');
+        config.empty.removeClass('d-none');
+        config.modal.find('.ai-suggestion-review__table-header').addClass('d-none');
+        config.modal.find('.ai-suggestion-review__title-group').addClass('d-none');
+        config.primary.attr('data-empty-confirmation', 'true')
+            .text(config.emptyPrimaryText)
+            .prop('disabled', false);
+        config.later.add(config.discard).addClass('d-none');
+        config.modal.modal('show');
+    }
+
+    function resetEmptyReviewModal(config) {
+        config.fields.removeAttr('data-empty-confirmation');
+        config.modal.removeAttr('data-empty-confirmation');
+        config.modal.find('.ai-suggestion-review').removeAttr('data-empty-confirmation');
+        config.empty.find('.ai-suggestion-review__empty-text').text('');
+        config.empty.addClass('d-none');
+        config.modal.find('.ai-suggestion-review__table-header').removeClass('d-none');
+        config.modal.find('.ai-suggestion-review__title-group').removeClass('d-none');
+        config.primary.removeAttr('data-empty-confirmation')
+            .text(config.primaryText)
+            .prop('disabled', true);
+        config.later.add(config.discard).removeClass('d-none');
+    }
+
+    function continueEmptyReview(config) {
+        config.primary.prop('disabled', true);
+        config.continueReview();
+    }
+
+    function updateMappingReviewSelection() {
+        const $suggestions = UIElements.mappingReviewFields.find('input[data-suggestion-id]');
+        const selectedCount = $suggestions.filter(':checked').length;
+        UIElements.mappingReviewSelectAll
+            .prop('checked', $suggestions.length > 0 && selectedCount === $suggestions.length)
+            .prop('indeterminate', false);
+        UIElements.btnAddMapping.prop('disabled', selectedCount === 0);
+    }
+
+    function toggleMappingReviewAll() {
+        UIElements.mappingReviewFields
+            .find('input[data-suggestion-id]')
+            .prop('checked', UIElements.mappingReviewSelectAll.prop('checked'));
+        updateMappingReviewSelection();
+    }
+
+    async function addSelectedMappingSuggestion() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        const suggestionIds = UIElements.mappingReviewFields
+            .find('input[data-suggestion-id]:checked')
+            .map(function () { return $(this).attr('data-suggestion-id'); })
+            .get();
+
+        if (!validateGuid(formVersion) || suggestionIds.length === 0) {
+            return;
+        }
+
+        UIElements.btnAddMapping.prop('disabled', true);
+        let result;
+        try {
+            result = await abp.ajax({
+                url: `/api/app/application-form-version/accept-mapping-suggestions?formVersionId=${encodeURIComponent(formVersion)}`,
+                type: 'POST',
+                contentType: 'application/json',
+                data: JSON.stringify({ suggestionIds })
+            });
+        } catch (error) {
+            abp.notify.error(
+                '',
+                error?.responseJSON?.error?.message || 'Unable to add the selected mapping suggestions.');
+            updateMappingReviewSelection();
+            return;
+        }
+
+        existingMappingString = result.submissionHeaderMapping;
+        $('#existingMapping').val(existingMappingString);
+        handleReset();
+
+        try {
+            await loadMappingReview(true);
+            checkMappingReviewComplete();
+        } catch (error) {
+            console.error('Unable to refresh mapping suggestions after they were added.', error);
+        } finally {
+            updateMappingReviewSelection();
+        }
+    }
+
+    function discardMappingSuggestions() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        abp.message.confirm('This will permanently remove the remaining AI mapping suggestions.', 'Discard remaining suggestions?')
+            .then(function (confirmed) {
+                if (!confirmed) {
+                    return;
+                }
+
+                return abp.ajax({
+                    url: `/api/app/application-form-version/discard-mapping-suggestions?formVersionId=${encodeURIComponent(formVersion)}`,
+                    type: 'POST'
+                })
+                    .done(function () {
+                        UIElements.mappingReviewModal.modal('hide');
+                        if (isFinalMappingPhase(UIElements.mappingReviewFields.attr('data-phase'))) {
+                            completeMappingReview();
+                        } else {
+                            offerWorksheetGeneration();
+                        }
+                    })
+                    .fail(function () {
+                        abp.notify.error('', 'Unable to discard the mapping suggestions.');
+                    });
+            });
+    }
+
+    function restartAiFlow() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            return;
+        }
+
+        abp.message.confirm(
+            'This permanently deletes AI workflow progress, AI-created worksheets and assignments, and all saved mappings for this form version.',
+            'Restart AI Flow?')
+            .then(function (confirmed) {
+                if (!confirmed) {
+                    return;
+                }
+
+                UIElements.btnRestartAiFlow.prop('disabled', true);
+                return abp.ajax({
+                    url: `/api/app/application-form-version/reset-ai-flow?formVersionId=${encodeURIComponent(formVersion)}`,
+                    type: 'POST'
+                }).done(function () {
+                    globalThis.location.reload();
+                }).fail(function (error) {
+                    abp.notify.error('', error?.responseJSON?.error?.message || 'Unable to restart the AI flow.');
+                }).always(function () {
+                    UIElements.btnRestartAiFlow.prop('disabled', false);
+                });
+            });
+    }
+
+    function offerWorksheetGeneration() {
+        const formVersion = String(document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(formVersion)) {
+            return;
+        }
+
+        return abp.ajax({
+            url: `/api/app/application-form-version/mapping-review-phase?formVersionId=${encodeURIComponent(formVersion)}&phase=WorksheetReview`,
+            type: 'POST'
+        }).done(function () {
+            loadMappingReview(false);
+        }).fail(function (error) {
+            abp.notify.error('', error?.responseJSON?.error?.message || 'Unable to continue to worksheet generation.');
+        });
+    }
+
+    function refreshMappingAfterGeneration(applicationId, formVersion = null) {
+        const resolvedFormVersion = String(formVersion ?? document.getElementById('formVersionId')?.value ?? '').trim();
+        if (!validateGuid(resolvedFormVersion)) {
+            abp.notify.error('', 'Unable to refresh the generated mapping because the Form Version ID is invalid.');
+            return;
+        }
+
+        loadMappingReview(true);
+    }
+
+    function restoreGenerateMappingButton($button, existingHtml) {
+        if (!$button?.length) {
+            return;
+        }
+
+        globalThis.AIGenerationButtonState?.restore($button);
+        $button.html(existingHtml).prop('disabled', false);
+        $button.find('span').last().text('Generate Mapping');
+    }
+
+    function restoreGenerateWorksheetButton($button, existingHtml) {
+        if (!$button?.length) {
+            return;
+        }
+
+        globalThis.AIGenerationButtonState?.restore($button);
+        $button.html(existingHtml).prop('disabled', false);
+    }
+
+    function restoreGenerateScoresheetButton($button, existingHtml) {
+        if (!$button?.length) {
+            return;
+        }
+
+        globalThis.AIGenerationButtonState?.restore($button);
+        $button.html(existingHtml).prop('disabled', false);
+        $button.find('span').last().text('Generate Scoresheet');
+    }
+
+    function handleSaveEditMapping() {
+        try {
+            let jsonText = $('#jsonText').val();
+            $.parseJSON(jsonText);
+            let mappingJsonStr = jsonText.replaceAll(/\s+/g, ' ').replaceAll(/(\r\n|\n|\r)/gm, "");
+            UIElements.btnSaveMapping.prop('disabled', true);
+            handleSaveMapping($.parseJSON(mappingJsonStr));
+            handleCancelMapping();
+
+            abp.notify.success(
+                '',
+                'Edit mapping save successful. Reloading page to new version'
+            );
+
+            setTimeout(function () {
+                globalThis.location.href = location.href;
+            }, 500);
+
+        }
+        catch (err) {
+            UIElements.btnSaveMapping.prop('disabled', false);
+            abp.notify.error(
+                '',
+                'The JSON is not valid:' + err
+            );
+        }
+    }
+
+    function handleCancelMapping() {
+        UIElements.editMappingModal.removeClass('display-modal');
+    }
+
+    function handleSeearchBar(e) {
+        let filterValue = e.currentTarget.value;
+        let oTable = $('#ApplicationFormsTable').dataTable();
+        oTable.fnFilter(filterValue);
+    }
+
+    function handleSelectVersion(e) {
+        let chefsFormVersionGuid = e.currentTarget.value;
+        navigateToVersion(chefsFormVersionGuid);
+    }
+
+    function navigateToVersion(chefsFormVersionGuid) {
+        abp.notify.success(
+            '',
+            'Reloading page to new version'
+        );
+
+        setTimeout(function () {
+            const url = new URL(globalThis.location.href);
+
+            // If this really is a GUID, validate it defensively
+            if (!/^[0-9a-fA-F-]{36}$/.test(chefsFormVersionGuid)) {
+                abp.notify.error("The CHEFS Form Version ID is not in a GUID format");
+                return; // or handle error
+            }
+
+            url.searchParams.set("ChefsFormVersionGuid", chefsFormVersionGuid);
+            globalThis.location.href = url.toString();
+        }, 500);
+    }
+
+    function bindExistingMaps() {
+        if (existingMappingString + "" != "undefined" && existingMappingString != null && existingMappingString != "") {
+            try {
+                let existingMapping = JSON.parse(existingMappingString);
+                let keys = Object.keys(existingMapping);
+                for (let key of keys) {
+                    let intakeProperty = key;
+                    let chefsMappingProperty = existingMapping[intakeProperty];
+                    let intakeMappingCard = document.getElementById("unity_" + intakeProperty);
+                    let chefsMappingDiv = document.getElementById(chefsMappingProperty);
+                    if (chefsMappingDiv != null && intakeMappingCard != null) {
+                        chefsMappingDiv.appendChild(intakeMappingCard);
+                    } else {
+                        abp.notify.error(
+                            '',
+                            'Could not map existing: ' + chefsMappingProperty
+                        );
+                    }
+                }
+            } catch (err) {
+                abp.notify.error('', aiL('AI:SavedMappingApplyFailed'));
+            }
+        }
+    }
+
+
+
+    function handleSync() {
+        let chefsFormVersionId = document.getElementById('chefsFormVersionId').value;
+        if (!validateGuid(chefsFormVersionId)) {
+            abp.notify.error(
+                '',
+                'The Form Version ID is not in a GUID format'
+            );
+            return;
+        }
+
+        if (chefsFormVersionId == "") {
+            abp.notify.error(
+                '',
+                'ChefsFormVersionGuid is neeeded - Mapping Not Synchronized Successful'
+            );
+
+        } else {
+            $.ajax(
+                {
+                    url: `/api/app/form/${chefsFormId}/version/${chefsFormVersionId}`,
+                    type: "POST",
+                    success: function (data) {
+                        let formVersion = data.formVersion;
+                        let updatedApplicationFormName = data.updatedFormName;
+                        let updatedNameMessage = updatedApplicationFormName ? 'Form name updated to ' + updatedApplicationFormName : 'Form name is unchanged';
+                        if (updatedApplicationFormName) {
+                            document.getElementById('applicationFormName').textContent = updatedApplicationFormName;
+                        }
+
+                        let availableChefsFields = JSON.parse(formVersion.availableChefsFields)
+                        document.getElementById('availableChefsFields').value = JSON.stringify(availableChefsFields);
+                        initializeIntakeMap(availableChefsFields);
+
+                        abp.notify.success(
+                            '',
+                            'Synchronized Successful' + updatedNameMessage
+                        );
+                        navigateToVersion(formVersion.chefsFormVersionGuid);
+                    },
+                    error: function () {
+                        abp.notify.error(
+                            '',
+                            'Mapping Not Synchronized Successful'
+                        );
+                    }
+                }
+            );
+        }
+    }
+
+
+
+    function handleSave() {
+        let mappingDivs = $('.map-div');
+        let mappingJson = {};
+
+        for (let mappingDiv of mappingDivs) {
+            let chefMappingDiv = mappingDiv;
+            if (chefMappingDiv.childElementCount > 0) {
+
+                let chefsKey = mappingDiv.id;
+                let intakeMappingChildren = chefMappingDiv.children;
+
+                for (let intakeMappingChild of intakeMappingChildren) {
+                    mappingJson[intakeMappingChild.id.replace('unity_', '')] = chefsKey;
+                }
+            }
+        }
+        handleSaveMapping(mappingJson);
+    }
+
+    function handleSaveMapping(mappingJson) {
+        let formData = JSON.parse(document.getElementById('applicationFormVersionDtoString').value);
+        formData["submissionHeaderMapping"] = JSON.stringify(mappingJson);
+        formData["availableChefsFields"] = document.getElementById('availableChefsFields').value;
+        formData["ChefsApplicationFormGuid"] = document.getElementById('applicationFormId').value;
+
+        UIElements.btnSave.prop('disabled', true);
+        $.ajax(
+            {
+                url: "/api/app/application-form-version/" + formVersionId,
+                data: JSON.stringify(formData),
+                contentType: "application/json",
+                type: "PUT",
+                success: function (data) {
+                    $('#existingMapping').val(data.submissionHeaderMapping);
+                    existingMappingString = data.submissionHeaderMapping;
+                    abp.notify.success(
+                        data.responseText,
+                        'Mapping Saved Successfully'
+                    );
+                },
+                error: function (data) {
+                    abp.notify.error(
+                        data.responseText,
+                        'Mapping Not Saved Successful'
+                    );
+                },
+                complete: function () {
+                    UIElements.btnSave.prop('disabled', false);
+                }
+            }
+        );
+    }
+
+    function handleReset() {
+        $(intakeMapColumn).empty();
+        $(worksheetMapColumn).empty();
+        let availableChefsFields = availableChefFieldsString ? JSON.parse(availableChefFieldsString) : []
+        initializeIntakeMap(availableChefsFields);
+        bindExistingMaps();
+    }
+
+
+    function createIntakeFieldCard(intakeField) {
+        let intakeFieldJson = intakeField;
+        let dragableDiv = document.createElement('div');
+        dragableDiv.id = 'unity_' + intakeFieldJson.Name;
+        dragableDiv.className = 'card mapping-field';
+        dragableDiv.setAttribute("draggable", "true");
+
+        // Set icon HTML (internal code, safe)
+        dragableDiv.innerHTML = `${setTypeIndicator(intakeField)}`;
+
+        // Append label as text node to prevent HTML injection
+        dragableDiv.appendChild(document.createTextNode(intakeFieldJson.Label));
+
+        // Append asterisk and route to the appropriate column based on custom status
+        if (intakeFieldJson.IsCustom) {
+            dragableDiv.appendChild(document.createTextNode(" *"));
+            dragableDiv.className += ' custom-field';
+            worksheetMapColumn.appendChild(dragableDiv);
+        } else {
+            intakeMapColumn.appendChild(dragableDiv);
+        }
+    }
+
+    function buildAvailableChefsFieldsRows(availableChefsFields) {
+        let rowsToAdd = [];
+        for (let key of Object.keys(availableChefsFields)) {
+            let jsonObj = JSON.parse(availableChefsFields[key]);
+            if (allowableTypes.has(jsonObj.type.trim())) {
+                rowsToAdd.push([stripHtml(jsonObj.label), key, jsonObj.type, key]);
+            }
+        }
+        return rowsToAdd;
+    }
+
+    function initializeIntakeMap(availableChefsFields) {
+        try {
+
+            let intakeFields = JSON.parse(intakeFieldsString);
+
+            for (let intakeField of intakeFields) {
+                if (!excludedIntakeMappings.has(intakeField.Name)) {
+                    createIntakeFieldCard(intakeField);
+                }
+            }
+
+            dataTable.clear();
+
+            let rowsToAdd = buildAvailableChefsFieldsRows(availableChefsFields);
+
+            if (rowsToAdd.length > 0) {
+                dataTable.rows.add(rowsToAdd);
+            }
+            dataTable.draw();
+        }
+        catch (err) {
+            console.info('Mapping error: ' + err);
+        }
+    }
+
+
+    document.addEventListener('dragstart', function (ev) {
+        if (ev.target.classList.contains('non-drag')) {
+            ev.preventDefault();
+            return;
+        } else if (ev.target.classList.contains('custom-field')) {
+            UIElements.customFieldsTab.trigger('click');
+        } else if (!ev.target.classList.contains('custom-field')) {
+            UIElements.intakeFieldsTab.trigger('click');
+        }
+        beingDragged(ev);
+    });
+
+    document.addEventListener('dragend', function (ev) {
+        if (ev.target.classList.contains('non-drag')) {
+            ev.preventDefault();
+            return;
+        }
+        dragEnd(ev);
+    });
+
+    document.addEventListener('dragover', function (event) {
+        let beingDragged = document.querySelector('.dragging');
+        if (event.target.matches('.card')) {
+            if (beingDragged.classList.contains('card')) {
+                allowDrop(event);
+            }
+        }
+        if (event.target.matches('.col')) {
+            if (beingDragged.classList.contains('card')) {
+                colDraggedOver(event);
+            }
+            if (beingDragged.classList.contains('col')) {
+                allowDrop(event);
+            }
+        }
+    });
+
+
+
+    function allowDrop(ev) {
+        ev.preventDefault();
+
+        let dragOver = ev.target;
+        let dragOverParent = dragOver.parentElement;
+        let beingDragged = document.querySelector('.dragging');
+        let draggedParent = beingDragged.parentElement;
+
+        let draggedIndex = whichChild(beingDragged);
+        let dragOverIndex = whichChild(dragOver);
+
+        if (draggedParent === dragOverParent) {
+            if (draggedIndex < dragOverIndex) {
+                beingDragged.before(dragOver);
+            } else if (draggedIndex > dragOverIndex) {
+                beingDragged.after(dragOver);
+            }
+        } else {
+            dragOver.before(beingDragged);
+        }
+    }
+
+    function colDraggedOver(event) {
+        let dragOver = event.target;
+        let beingDragged = document.querySelector('.dragging');
+        let draggedParent = beingDragged.parentElement;
+        if (
+            draggedParent.id !== dragOver.id &&
+            draggedParent.classList.contains('col') &&
+            dragOver.classList.contains('col')
+        ) {
+            if (dragOver.childElementCount == 0) {
+                dragOver.appendChild(beingDragged);
+            }
+        }
+    }
+
+
+
+
+
+
+    function handleMappingTabClick() {
+        loadMappingReview(false);
+        // Refresh the hidden field with the latest form version ID
+        let refreshAvailableWorkSheets = UIElements.refreshAvailableWorksheetsHidden.val();
+        if (refreshAvailableWorkSheets && refreshAvailableWorkSheets !== "undefined") {
+            navigateToVersion(refreshAvailableWorkSheets);
+        }
+    }
+
+    PubSub.subscribe(
+        'refresh_available_worksheets',
+        (_, data) => {
+            UIElements.refreshAvailableWorksheetsHidden.val(data.chefsFormVersionId);
+        }
+    );
+
+
+});
+
+
+function handleBack() {
+    location.href = '/ApplicationForms';
+}
+
+function beingDragged(ev) {
+    let draggedEl = ev.target;
+    if (draggedEl.classList + "" !== "undefined") {
+        draggedEl.classList.add('dragging');
+    }
+}
+
+function dragEnd(ev) {
+    let draggedEl = ev.target;
+    if (draggedEl.classList + "" !== "undefined") {
+        draggedEl.classList.remove('dragging');
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/_AiSuggestionReviewModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/_AiSuggestionReviewModal.cshtml
new file mode 100644
index 0000000000..a998cee9e8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/_AiSuggestionReviewModal.cshtml
@@ -0,0 +1,50 @@
+@using Unity.GrantManager.Web.Pages.ApplicationForms
+@model AiSuggestionReviewModalModel
+
+<div class="modal fade" id="@Model.ModalId" tabindex="-1" aria-labelledby="@Model.ModalLabelId" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-centered">
+        <div class="modal-content ai-suggestion-review">
+        <div class="ai-suggestion-review__panel" data-hide-target-column="@Model.HideTargetColumn.ToString().ToLowerInvariant()">
+                <div class="modal-header ai-suggestion-review__header">
+                    <h5 class="modal-title" id="@Model.ModalLabelId">@Model.Title</h5>
+                </div>
+                <div class="modal-body ai-suggestion-review__body">
+                    @if (!string.IsNullOrWhiteSpace(Model.TitleInputId))
+                    {
+                        <div class="ai-suggestion-review__title-group">
+                            <label for="@Model.TitleInputId" class="form-label">@Model.TitleInputLabel</label>
+                            <input id="@Model.TitleInputId" class="form-control" type="text" required maxlength="256"
+                                   placeholder="@Model.TitleInputPlaceholder" autocomplete="off" />
+                        </div>
+                    }
+                    <div class="ai-suggestion-review__list">
+                        <div class="ai-suggestion-review__table-header">
+                            <span>@Model.SourceColumnTitle</span><span aria-hidden="true"></span>@if (!Model.HideTargetColumn)
+                            {
+                                <span>@Model.TargetColumnTitle</span>
+                            }
+                            <div class="form-check unt-form-switch form-switch mb-0 ai-suggestion-review__select-all">
+                                <input id="@Model.SelectAllId" class="form-check-input" type="checkbox" aria-label="Include all suggestions" disabled="@(!Model.CanMutate)" />
+                            </div>
+                        </div>
+                        <div id="@Model.FieldsId" data-section-data-attribute="@Model.SectionDataAttribute"></div>
+                        <div id="@Model.EmptyId" class="ai-suggestion-review__empty d-none">
+                            <span class="ai-suggestion-review__empty-text">@Model.EmptyText</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer ai-suggestion-review__footer">
+                    @if (Model.CanMutate)
+                    {
+                        <button type="button" id="@Model.PrimaryActionId" class="btn unt-btn-primary btn-primary" disabled="@Model.PrimaryActionDisabled">@Model.PrimaryActionText</button>
+                    }
+                    <button type="button" id="@Model.ReviewLaterActionId" class="btn unt-btn-outline-primary btn-outline-primary" data-bs-dismiss="modal">Review later</button>
+                    @if (Model.CanMutate)
+                    {
+                        <button type="button" id="@Model.DiscardActionId" class="btn btn-outline-danger ai-suggestion-review__discard">Discard remaining</button>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
index 2636b8fc95..ccf933360c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
@@ -25,6 +25,10 @@
     {
         <abp-style src="/Views/Settings/NotificationsSettingGroup/Default.css" />
     }
+    @if (Model.ShowProgramDetails)
+    {
+        <abp-style src="/Views/Settings/ProgramDetails/ProgramDetails.css" />
+    }
 }
 
 @section scripts {
@@ -46,6 +50,11 @@
     {
         <abp-script src="/Views/Settings/AISettingGroup/Default.js" />
     }
+    @if (Model.ShowProgramDetails)
+    {
+        <abp-script src="/Views/Settings/ProgramDetails/CharacterCounter.js" />
+        <abp-script src="/Views/Settings/ProgramDetails/ProgramDetails.js" />
+    }
 }
 
 <div class="config-page-layout">
@@ -88,6 +97,12 @@
                     AI
                 </li>
             }
+            @if (Model.ShowProgramDetails)
+            {
+                <li id="program-details-menu-item" class="nav-item btn btn-nav" data-target="program-details-div">
+                    Program Details
+                </li>
+            }
         </ul>
     </div>
     <!-- Main Content -->
@@ -230,5 +245,13 @@
                 @await Component.InvokeAsync(typeof(Unity.AI.Web.Views.Settings.AISettingGroup.AISettingViewComponent))
             </div>
         }
+
+        <!-- Program Details -->
+        @if (Model.ShowProgramDetails)
+        {
+            <div id="program-details-div" class="config-section input-area card mb-3 config-management hide">
+                @await Component.InvokeAsync(typeof(Unity.GrantManager.Web.Views.Settings.ProgramDetails.ProgramDetailsViewComponent))
+            </div>
+        }
     </div>
 </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml
index 80c2d7a984..952ad6afb9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml
@@ -1,8 +1,12 @@
 @page
+@using Microsoft.Extensions.Localization
+@using Unity.GrantManager.Localization
 @model Unity.GrantManager.Web.Pages.ErrorModel
+@inject IStringLocalizer<GrantManagerResource> L
 
 @{
     var code = Model.HttpStatusCode;
+    var isWrongTenant = code == 409;
 
     string title;
     string message;
@@ -17,6 +21,10 @@
             title = "Access Denied";
             message = "You do not have permission to view this page.";
             break;
+        case 409:
+            title = L["WrongTenantError:Title"].Value;
+            message = string.Empty;
+            break;
         case 500:
             title = "Something Went Wrong";
             message = "An unexpected error occurred. Please try again, or contact support if the problem persists.";
@@ -31,6 +39,17 @@
 <div class="card mt-3 shadow-sm rounded">
     <div class="card-body p-5 text-center">
         <h4>@title</h4>
-        <p class="mt-3">@message</p>
+        @if (isWrongTenant)
+        {
+            <p class="mt-3">
+                @L["WrongTenantError:ApplicationTenant", Model.ApplicationTenantName]<br />
+                @L["WrongTenantError:CurrentTenant", Model.CurrentTenantName]
+            </p>
+            <p>@L["WrongTenantError:Instructions"]</p>
+        }
+        else
+        {
+            <p class="mt-3">@message</p>
+        }
     </div>
 </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml.cs
index 246f000a8d..aefc0dae49 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Error.cshtml.cs
@@ -5,9 +5,13 @@ namespace Unity.GrantManager.Web.Pages;
 public class ErrorModel : PageModel
 {
     public int HttpStatusCode { get; private set; }
+    public string? ApplicationTenantName { get; private set; }
+    public string? CurrentTenantName { get; private set; }
 
-    public void OnGet(int httpStatusCode = 0)
+    public void OnGet(int httpStatusCode = 0, string? applicationTenantName = null, string? currentTenantName = null)
     {
         HttpStatusCode = httpStatusCode;//HTTP Status Code
+        ApplicationTenantName = applicationTenantName;
+        CurrentTenantName = currentTenantName;
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
index a6c5e0b226..40884fc686 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -52,8 +52,9 @@
 }
 @section styles
 {
-    <abp-style src="/libs/formiojs/formio.form.css" />
-    <abp-style src="/Pages/GrantApplications/Details.css" />
+    <abp-style src="/libs/formiojs/formio.form.css" />
+    <abp-style src="/Pages/GrantApplications/ai-generation-button.css" />
+    <abp-style src="/Pages/GrantApplications/Details.css" />
 }
 @section scripts
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
index f01f08326a..223565f1e8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
@@ -21,6 +21,7 @@
 using Unity.Modules.Shared.Specializations;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Abp.Features;
+using Volo.Abp.TenantManagement;
 using Volo.Abp.Users;
 
 namespace Unity.GrantManager.Web.Pages.GrantApplications
@@ -33,6 +34,7 @@ public class DetailsModel : AbpPageModel
         private readonly IApplicationFormVersionAppService _applicationFormVersionAppService;
         private readonly IScoresheetRepository _scoresheetRepository;
         private readonly IFeatureChecker _featureChecker;
+        private readonly ITenantRepository _tenantRepository;
         protected readonly IZoneManagementAppService _zoneManagementAppService;
 
         [BindProperty(SupportsGet = true)]
@@ -48,6 +50,9 @@ public class DetailsModel : AbpPageModel
         [BindProperty(SupportsGet = true)]
         public Guid ApplicationId { get; set; }
 
+        [BindProperty(SupportsGet = true)]
+        public Guid? TenantId { get; set; }
+
         [BindProperty(SupportsGet = true)]
         public Guid ApplicationFormVersionId { get; set; }
 
@@ -94,6 +99,7 @@ public DetailsModel(
             IApplicationFormVersionAppService applicationFormVersionAppService,
             IScoresheetRepository scoresheetRepository,
             IFeatureChecker featureChecker,
+            ITenantRepository tenantRepository,
             ICurrentUser currentUser,
             IConfiguration configuration,
             IZoneManagementAppService zoneManagementAppService)
@@ -103,6 +109,7 @@ public DetailsModel(
             _featureChecker = featureChecker;
             _applicationFormVersionAppService = applicationFormVersionAppService;
             _scoresheetRepository = scoresheetRepository;
+            _tenantRepository = tenantRepository;
             _zoneManagementAppService = zoneManagementAppService;
 
             CurrentUserId = currentUser.Id;
@@ -113,8 +120,19 @@ public DetailsModel(
             TotalEmailAttachmentMaxFileSize = configuration["S3:EmailAttachmentsTotalMaxFileSize"] ?? "25";
         }
 
-        public async Task OnGetAsync()
+        public async Task<IActionResult> OnGetAsync()
         {
+            if (TenantId.HasValue && TenantId.Value != CurrentTenant.Id)
+            {
+                var applicationTenant = await _tenantRepository.FindAsync(TenantId.Value);
+                return RedirectToPage("/Error", new
+                {
+                    httpStatusCode = 409,
+                    applicationTenantName = applicationTenant?.Name ?? TenantId.Value.ToString(),
+                    currentTenantName = CurrentTenant.Name ?? "Host"
+                });
+            }
+
             if (await _featureChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
             {
                 ViewData["ActiveNavHref"] = "/TenantManagement/Onboarding";
@@ -152,6 +170,8 @@ public async Task OnGetAsync()
             ArgumentNullException.ThrowIfNull(applicationForm);
             ApplicationScoresheetSchemaJson = await GetApplicationScoresheetSchemaJsonAsync(applicationForm);
             ApplicationFormSubmissionData = applicationFormSubmission.Submission;
+
+            return Page();
         }
 
         public async Task<IActionResult> OnPostAsync()
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
index 666206fd20..7590f16596 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
@@ -66,41 +66,6 @@
     justify-content: center;
 }
 
-.ai-button-content {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: 0.5rem;
-}
-
-.ai-generate-btn {
-    height: 2.25rem;
-}
-
-.ai-generate-btn:disabled,
-.ai-generate-btn.disabled {
-    cursor: not-allowed;
-    opacity: 0.55;
-    pointer-events: none;
-}
-
-.ai-generate-btn:disabled:hover,
-.ai-generate-btn.disabled:hover,
-.ai-generate-btn[data-ai-shared-generating='1'],
-.ai-generate-btn[data-ai-cooldown-active='1'],
-.ai-generate-btn[data-ai-cooldown-checking='1'] {
-    pointer-events: none;
-}
-
-.ai-generate-btn.btn-sm {
-    height: 2rem;
-}
-
-.ai-generate-btn .spinner-border-sm {
-    width: 0.875rem;
-    height: 0.875rem;
-}
-
 .left-card {
     border-right: 1px solid #dddddd;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button.css
new file mode 100644
index 0000000000..7a01423328
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button.css
@@ -0,0 +1,32 @@
+.ai-button-content {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+}
+
+.ai-generate-btn {
+    height: 2.25rem;
+}
+
+.ai-generate-btn:disabled,
+.ai-generate-btn.disabled,
+.ai-generate-btn[data-ai-shared-generating='1'],
+.ai-generate-btn[data-ai-cooldown-active='1'],
+.ai-generate-btn[data-ai-cooldown-checking='1'] {
+    cursor: not-allowed;
+    opacity: 1;
+    background-color: #e9ecef !important;
+    border-color: #adb5bd !important;
+    color: #495057 !important;
+    pointer-events: none;
+}
+
+.ai-generate-btn.btn-sm {
+    height: 2rem;
+}
+
+.ai-generate-btn .spinner-border-sm {
+    width: 0.875rem;
+    height: 0.875rem;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
index e91f359097..7bd57e4276 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
@@ -3,7 +3,7 @@
  * across every .ai-generate-btn so all AI surfaces behave consistently.
  */
 (function () {
-    const BUTTON_SELECTOR = '.ai-generate-btn';
+    const BUTTON_SELECTOR = '.ai-generate-btn:not([data-ai-review-action="true"])';
     const ATTR_LABEL = 'data-original-label';
     const ATTR_COOLDOWN = 'data-ai-cooldown-active';
     const ATTR_CHECKING = 'data-ai-cooldown-checking';
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
index 2e7f8e8796..f3cbf078b3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
@@ -31,7 +31,7 @@
                 <div class="d-flex justify-content-end flex-wrap gap-2 scoresheet-top-btn-group">
                     @if (Model.IsAIScoringEnabled && Model.IsAiAssessment)
                     {
-                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn" id="regenerateAiScoresheetBtn" onclick="queueApplicationScoring()" data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" disabled>
+                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary ai-generate-btn" id="regenerateAiScoresheetBtn" onclick="queueApplicationScoring(this)" data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" disabled>
                             <span class="ai-button-content">
                                 <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
                                 <span>Generate</span>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js
index 42423e1078..8734176e4c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js
@@ -908,9 +908,6 @@ function queueApplicationScoring(triggerButton = null) {
 
 $(function () {
     // Static buttons
-    $(document).on('click', '#regenerateAiScoresheetBtn', function () {
-        queueApplicationScoring();
-    });
     $(document).on('click', '#btn-expand-all', function () {
         expandAllAccordions('assessment-scoresheet');
     });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
index 579a7aaebf..4f5e8c5a80 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
@@ -12,36 +12,10 @@
         <h5>Scoresheet & Worksheets Configuration</h5>
     </div>
     <div class="col-12 col-md-4 btn-wrapper">
-        <abp-button id="btn-save-worksheet-config"
-                    text="Save"
-                    type="submit"
-                    icon-type="Other"
-                    icon="fl fl-save"
-                    class="btn unt-btn-primary btn-primary"
-                    abp-tooltip="Save the worksheet associations for mapping to the available Unity worksheet fields"
-                    button-type="Primary"
-                    form="worksheet-config-form" />
-        @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormWorksheet.Generate))
-        {
-            <button type="button" id="btn-generate-worksheet" class="btn ai-generate-btn unt-btn-outline-primary btn-outline-primary @(Model.HasPendingAiWorksheet ? "d-none" : string.Empty)"
-                    data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" data-ai-pending="@(Model.HasPendingAiWorksheet.ToString().ToLowerInvariant())" disabled
-                    title="Generate a worksheet for the current form version">
-                <span class="ai-button-content">
-                    <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
-                    <span>Generate Worksheet</span>
-                </span>
-            </button>
-            <button type="button" id="btn-review-worksheet" class="btn unt-btn-outline-primary btn-outline-primary @(Model.HasPendingAiWorksheet ? string.Empty : "d-none")"
-                    title="Review the pending AI worksheet">
-                <span class="ai-button-content">
-                    <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
-                    <span>Review Worksheet</span>
-                </span>
-            </button>
-        }
-        @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormScoresheet.Generate))
+        @if (await PermissionChecker.IsGrantedAsync(AIPermissions.FormScoresheet.View))
         {
             <button type="button" id="btn-generate-scoresheet" class="btn ai-generate-btn unt-btn-outline-primary btn-outline-primary"
+                    data-ai-can-generate="@(await PermissionChecker.IsGrantedAsync(AIPermissions.FormScoresheet.Generate) ? "true" : "false")"
                     data-ai-cooldown-checking="1" data-ai-rate-limit-disabled="1" disabled
                     title="Generate a scoresheet for the current form version">
                 <span class="ai-button-content">
@@ -50,6 +24,15 @@
                 </span>
             </button>
         }
+        <abp-button id="btn-save-worksheet-config"
+                    text="Save"
+                    type="submit"
+                    icon-type="Other"
+                    icon="fl fl-save"
+                    class="btn unt-btn-primary btn-primary"
+                    abp-tooltip="Save the worksheet associations for mapping to the available Unity worksheet fields"
+                    button-type="Primary"
+                    form="worksheet-config-form" />
         <abp-button id="btn-back-worksheet-config"
                     text="Back"
                     class="btn unt-btn-outline-primary btn-outline-primary"
@@ -189,40 +172,3 @@
         </div>
     </form>
 </div>
-
-<div class="modal fade" id="aiWorksheetReviewModal" tabindex="-1" aria-labelledby="aiWorksheetReviewModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-centered">
-        <div class="modal-content ai-worksheet-review">
-            <div class="ai-worksheet-review__panel">
-                <div class="modal-header ai-worksheet-review__header">
-                    <div>
-                        <h5 class="modal-title" id="aiWorksheetReviewModalLabel">Create worksheet draft</h5>
-                    </div>
-                </div>
-                <div class="modal-body ai-worksheet-review__body">
-                    <div class="ai-worksheet-review__title-group">
-                        <label for="aiWorksheetTitle" class="form-label">Worksheet title</label>
-                        <input id="aiWorksheetTitle" class="form-control" type="text" required maxlength="256" placeholder="e.g., Project details" autocomplete="off" />
-                    </div>
-                    <div class="ai-worksheet-review__list">
-                        <div class="ai-worksheet-review__table-header">
-                            <span>Source field</span>
-                            <span aria-hidden="true"></span>
-                            <span>Worksheet field</span>
-                            <div class="form-check unt-form-switch form-switch mb-0 ai-worksheet-review__select-all">
-                                <input id="aiWorksheetReviewSelectAll" class="form-check-input" type="checkbox" aria-label="Include all suggested fields" />
-                            </div>
-                        </div>
-                        <div id="aiWorksheetReviewFields"></div>
-                        <div id="aiWorksheetReviewEmpty" class="ai-worksheet-review__empty d-none">No custom fields were suggested.</div>
-                    </div>
-                </div>
-                <div class="modal-footer ai-worksheet-review__footer">
-                    <button type="button" id="btn-create-ai-worksheet-draft" class="btn unt-btn-primary btn-primary" disabled>Create draft</button>
-                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" data-bs-dismiss="modal">Review later</button>
-                    <button type="button" id="btn-discard-ai-worksheet" class="btn btn-outline-danger ai-worksheet-review__discard">Discard remaining</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.css
index e5511e4b19..7a9c3bad91 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.css
@@ -112,27 +112,27 @@
     height: calc(100vh - 250px);
 }
 
-.ai-worksheet-review {
+.ai-suggestion-review {
     border: 0;
     border-radius: 10px;
     overflow: hidden;
 }
 
-.ai-worksheet-review__panel {
+.ai-suggestion-review__panel {
     display: flex;
     flex-direction: column;
     gap: 12px;
     padding: 20px;
 }
 
-.ai-worksheet-review__panel > .modal-header,
-.ai-worksheet-review__panel > .modal-body,
-.ai-worksheet-review__panel > .modal-footer {
+.ai-suggestion-review__panel > .modal-header,
+.ai-suggestion-review__panel > .modal-body,
+.ai-suggestion-review__panel > .modal-footer {
     margin: 0;
     padding: 0;
 }
 
-.ai-worksheet-review__body {
+.ai-suggestion-review__body {
     display: flex;
     flex: 0 1 auto;
     flex-direction: column;
@@ -140,17 +140,17 @@
     max-height: min(65vh, 42rem);
 }
 
-.ai-worksheet-review__list {
+.ai-suggestion-review__list {
     flex: 0 1 auto;
     min-height: 0;
     overflow-y: auto;
 }
 
-.ai-worksheet-review__header {
+.ai-suggestion-review__header {
     border-bottom: 0;
 }
 
-.ai-worksheet-review .modal-title {
+.ai-suggestion-review .modal-title {
     color: #1f2933;
     font-size: 1.25rem;
     font-weight: 600;
@@ -158,30 +158,30 @@
     margin: 0;
 }
 
-.ai-worksheet-review__title-group .form-label {
+.ai-suggestion-review__title-group .form-label {
     color: #334e68;
     font-size: 0.875rem;
     font-weight: 600;
     margin-bottom: 0.25rem;
 }
 
-.ai-worksheet-review__title-group .form-control {
+.ai-suggestion-review__title-group .form-control {
     border-color: #b8c7d6;
     font-size: 0.9375rem;
 }
 
-.ai-worksheet-review__title-group .form-control:focus {
+.ai-suggestion-review__title-group .form-control:focus {
     border-color: var(--bc-colors-blue-primary, #255a90);
     box-shadow: 0 0 0 0.2rem rgb(37 90 144 / 15%);
 }
 
-.ai-worksheet-review__table-header,
-.ai-worksheet-review__field {
+.ai-suggestion-review__table-header,
+.ai-suggestion-review__field {
     display: grid;
     grid-template-columns: minmax(0, 1fr) 2rem minmax(0, 1fr) auto;
 }
 
-.ai-worksheet-review__table-header {
+.ai-suggestion-review__table-header {
     align-items: center;
     background: #f4f7fa;
     border-bottom: 1px solid #d8e1eb;
@@ -197,17 +197,58 @@
     text-transform: uppercase;
 }
 
-.ai-worksheet-review__field {
+.ai-suggestion-review__field {
     align-items: center;
     min-height: 3.5rem;
     padding-inline: 0.75rem;
 }
 
-.ai-worksheet-review__field + .ai-worksheet-review__field {
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__table-header,
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__field {
+    grid-template-columns: minmax(0, 1fr) 2rem auto;
+}
+
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__switch,
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__section-header .form-switch {
+    align-items: center;
+    display: flex;
+    justify-content: flex-end;
+    min-height: 2rem;
+    min-width: 2.5rem;
+}
+
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__switch .form-check-input,
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__section-header .form-check-input {
+    transform: scale(0.9);
+}
+
+.ai-suggestion-review__panel[data-hide-target-column="true"] .ai-suggestion-review__select-all .form-check-input {
+    transform: scale(0.9);
+}
+
+.ai-suggestion-review__section-header {
+    align-items: center;
+    background: #eef3f7;
+    border-top: 1px solid #d8e1eb;
+    color: #334e68;
+    display: flex;
+    font-weight: 700;
+    justify-content: space-between;
+    padding: 0.65rem 0.75rem;
+}
+
+.ai-suggestion-review__source {
+    align-items: center;
+    display: flex;
+    gap: 0.5rem;
+    overflow-wrap: anywhere;
+}
+
+.ai-suggestion-review__field + .ai-suggestion-review__field {
     border-top: 1px solid #edf1f5;
 }
 
-.ai-worksheet-review__field-name {
+.ai-suggestion-review__field-name {
     color: #1f2933;
     font-size: 0.9375rem;
     font-weight: 600;
@@ -215,46 +256,130 @@
     overflow-wrap: anywhere;
 }
 
-.ai-worksheet-review__arrow {
+.ai-suggestion-review__arrow {
     color: #52789d;
     justify-self: center;
 }
 
-.ai-worksheet-review__switch {
+.ai-suggestion-review__switch {
     justify-self: end;
 }
 
-.ai-worksheet-review__field:hover {
+.ai-suggestion-review__field:hover {
     background: #f9fbfd;
 }
 
-.ai-worksheet-review__select-all {
+.ai-suggestion-review__select-all {
     align-items: center;
     display: flex;
     justify-self: end;
 }
 
-.ai-worksheet-review__empty {
+.ai-suggestion-review__empty {
     color: #486581;
     text-align: center;
 }
 
-.ai-worksheet-review__footer {
+.ai-suggestion-review[data-empty-confirmation] .ai-suggestion-review__header {
+    justify-content: center;
+    padding-top: 0.5rem;
+    text-align: center;
+}
+
+.ai-suggestion-review[data-empty-confirmation] .ai-suggestion-review__body {
+    min-height: 12rem;
+}
+
+.ai-suggestion-review[data-empty-confirmation] .ai-suggestion-review__list {
+    align-items: center;
+    display: flex;
+    justify-content: center;
+    min-height: 10rem;
+}
+
+.ai-suggestion-review[data-empty-confirmation] .ai-suggestion-review__empty {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    font-size: 1rem;
+    font-weight: 500;
+    line-height: 1.5;
+    max-width: 28rem;
+    padding: 1.5rem 1rem;
+    text-align: center;
+}
+
+.ai-suggestion-review__empty-icon {
+    align-items: center;
+    background: #e8f1f8;
+    border-radius: 50%;
+    color: #255a90;
+    display: inline-flex;
+    font-size: 1.35rem;
+    height: 3.5rem;
+    justify-content: center;
+    margin-bottom: 0.9rem;
+    position: relative;
+    width: 3.5rem;
+}
+
+.ai-suggestion-review__empty-check {
+    align-items: center;
+    background: #2f855a;
+    border: 2px solid #fff;
+    border-radius: 50%;
+    bottom: -0.15rem;
+    color: #fff;
+    display: inline-flex;
+    font-size: 0.55rem;
+    height: 1.25rem;
+    justify-content: center;
+    position: absolute;
+    right: -0.15rem;
+    width: 1.25rem;
+}
+
+.ai-suggestion-review__empty-title {
+    color: #1f2933;
+    font-size: 1.08rem;
+    font-weight: 600;
+    line-height: 1.35;
+    margin-bottom: 0.4rem;
+}
+
+.ai-suggestion-review__empty-text {
+    color: #627d98;
+    font-size: 0.92rem;
+    font-weight: 400;
+    line-height: 1.55;
+}
+
+.ai-suggestion-review[data-empty-confirmation] .ai-suggestion-review__footer {
+    justify-content: center;
+}
+
+.ai-suggestion-review[data-empty-confirmation] .ai-suggestion-review__footer .btn-primary {
+    font-size: 0.9rem;
+    min-width: 0;
+    padding: 0.5rem 1.25rem;
+}
+
+.ai-suggestion-review__footer {
     border-top: 0;
     gap: 0.5rem;
     justify-content: flex-start;
 }
 
-.ai-worksheet-review__footer > * {
+.ai-suggestion-review__footer > * {
     margin: 0;
 }
 
-.ai-worksheet-review__footer .btn {
+.ai-suggestion-review__footer .btn {
     font-size: inherit;
     font-weight: 400;
 }
 
-.ai-worksheet-review__discard {
+.ai-suggestion-review__discard {
     --bs-btn-color: #b42318;
     --bs-btn-border-color: #b42318;
     --bs-btn-hover-bg: #b42318;
@@ -263,33 +388,33 @@
 }
 
 @media (max-width: 767.98px) {
-    .ai-worksheet-review__body {
+    .ai-suggestion-review__body {
         max-height: 70vh;
     }
 
-    .ai-worksheet-review__table-header {
+    .ai-suggestion-review__table-header {
         display: flex;
         justify-content: flex-end;
     }
 
-    .ai-worksheet-review__table-header > span {
+    .ai-suggestion-review__table-header > span {
         display: none;
     }
 
-    .ai-worksheet-review__field {
+    .ai-suggestion-review__field {
         grid-template-columns: minmax(0, 1fr) 1.5rem auto;
         row-gap: 0.5rem;
     }
 
-    .ai-worksheet-review__field-name:first-child {
+    .ai-suggestion-review__field-name:first-child {
         grid-column: 1 / 2;
     }
 
-    .ai-worksheet-review__field-name:nth-child(3) {
+    .ai-suggestion-review__field-name:nth-child(3) {
         grid-column: 1 / 2;
     }
 
-    .ai-worksheet-review__field-name::before {
+    .ai-suggestion-review__field-name::before {
         color: #596777;
         content: attr(data-field-role);
         display: block;
@@ -300,12 +425,12 @@
         text-transform: uppercase;
     }
 
-    .ai-worksheet-review__arrow {
+    .ai-suggestion-review__arrow {
         grid-column: 2 / 3;
         grid-row: 1 / 3;
     }
 
-    .ai-worksheet-review__switch {
+    .ai-suggestion-review__switch {
         grid-column: 3 / 4;
         grid-row: 1 / 3;
     }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs
index 9018a0a016..c4a9ed510b 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs
@@ -30,6 +30,7 @@ public async Task Should_Seed_All_Configured_Models()
             .Returns(callInfo =>
             {
                 var model = callInfo.Arg<AIModel>();
+                ArgumentNullException.ThrowIfNull(model);
                 insertedModels.Add(model);
                 return Task.FromResult(model);
             });
@@ -70,9 +71,10 @@ public async Task Should_Update_Existing_Model_When_Provider_Is_Stale()
                 cancellationToken: Arg.Any<System.Threading.CancellationToken>())
             .Returns(callInfo =>
             {
-                var predicate = callInfo
-                    .Arg<System.Linq.Expressions.Expression<Func<AIModel, bool>>>()
-                    .Compile();
+                var predicateExpression = callInfo
+                    .Arg<System.Linq.Expressions.Expression<Func<AIModel, bool>>>();
+                ArgumentNullException.ThrowIfNull(predicateExpression);
+                var predicate = predicateExpression.Compile();
                 return Task.FromResult(new[] { existingModel }.Where(predicate).ToList());
             });
 
@@ -85,7 +87,7 @@ public async Task Should_Update_Existing_Model_When_Provider_Is_Stale()
         DeserializeSettings(existingModel.SettingsJson).MaxOutputTokenCountSupported.ShouldBeFalse();
         await modelRepository.Received(1).UpdateAsync(existingModel, autoSave: true);
         await modelRepository.DidNotReceive().InsertAsync(
-            Arg.Is<AIModel>(model => model.Name == existingModel.Name),
+            Arg.Is<AIModel>(model => model != null && model.Name == existingModel.Name),
             Arg.Any<bool>(),
             Arg.Any<System.Threading.CancellationToken>());
     }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIPromptDataSeederTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIPromptDataSeederTests.cs
index a391d2cf08..9594190aa4 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIPromptDataSeederTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIPromptDataSeederTests.cs
@@ -27,7 +27,7 @@ public async Task Should_Seed_The_Complete_BuiltIn_Prompt_Matrix()
             .Returns((AIPrompt?)null);
         promptRepository
             .InsertAsync(Arg.Any<AIPrompt>(), Arg.Any<bool>(), Arg.Any<System.Threading.CancellationToken>())
-            .Returns(callInfo =>
+            .ReturnsForAnyArgs(callInfo =>
             {
                 var prompt = callInfo.Arg<AIPrompt>();
                 ArgumentNullException.ThrowIfNull(prompt);
@@ -53,8 +53,55 @@ prompt.TenantId is null &&
             prompt.IsActive &&
             !string.IsNullOrWhiteSpace(prompt.SystemPrompt) &&
             !string.IsNullOrWhiteSpace(prompt.UserPrompt)).ShouldBeTrue();
+
+        var worksheetPrompt = insertedPrompts.Single(prompt => prompt.Name == AIPromptTypes.FormWorksheet);
+        worksheetPrompt.UserPrompt.ShouldContain("all applicable field suggestions");
+        worksheetPrompt.UserPrompt.ShouldContain("empty fields array");
     }
 
+
+    [Fact]
+    public async Task Should_Update_Existing_Prompt_To_Current_Definition()
+    {
+        var existingPrompt = new AIPrompt(Guid.NewGuid(), AIPromptTypes.FormWorksheet, 2, "old system prompt", "old user prompt")
+        {
+            MetadataJson = "old metadata",
+            IsActive = false
+        };
+        var promptName = existingPrompt.Name;
+        var promptVersion = existingPrompt.VersionNumber;
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
+        promptRepository
+            .FirstOrDefaultAsync(Arg.Any<Expression<Func<AIPrompt, bool>>>())
+            .ReturnsForAnyArgs(callInfo =>
+            {
+                var predicate = callInfo.Arg<Expression<Func<AIPrompt, bool>>>().Compile();
+                var probe = new AIPrompt(Guid.NewGuid(), promptName, promptVersion, string.Empty, string.Empty);
+                return Task.FromResult<AIPrompt>(predicate(probe) ? existingPrompt : null!);
+            });
+        promptRepository
+            .FirstOrDefaultAsync(Arg.Any<Expression<Func<AIPrompt, bool>>>(), Arg.Any<System.Threading.CancellationToken>())
+            .ReturnsForAnyArgs(callInfo =>
+            {
+                var predicate = callInfo.Arg<Expression<Func<AIPrompt, bool>>>().Compile();
+                var probe = new AIPrompt(Guid.NewGuid(), promptName, promptVersion, string.Empty, string.Empty);
+                return Task.FromResult<AIPrompt>(predicate(probe) ? existingPrompt : null!);
+            });
+        promptRepository
+            .UpdateAsync(Arg.Any<AIPrompt>(), true, Arg.Any<System.Threading.CancellationToken>())
+            .ReturnsForAnyArgs(callInfo => Task.FromResult(callInfo.Arg<AIPrompt>()));
+
+        var currentTenant = Substitute.For<ICurrentTenant>();
+        currentTenant.Change(null).Returns(Substitute.For<IDisposable>());
+        var seeder = new AIPromptDataSeeder(promptRepository, currentTenant);
+        await seeder.SeedAsync(new DataSeedContext());
+
+        existingPrompt.SystemPrompt.ShouldNotBe("old system prompt");
+        existingPrompt.UserPrompt.ShouldContain("WORKSHEET");
+        existingPrompt.MetadataJson.ShouldContain("DATA");
+        existingPrompt.IsActive.ShouldBeTrue();
+        await promptRepository.Received().UpdateAsync(existingPrompt, true, Arg.Any<System.Threading.CancellationToken>());
+    }
     private static void AssertVersions(
         IEnumerable<AIPrompt> prompts,
         string promptName,
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/GenerateFormWorksheetJobTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/GenerateFormWorksheetJobTests.cs
index 96a8975302..557345369f 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/GenerateFormWorksheetJobTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/GenerateFormWorksheetJobTests.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Shouldly;
 using Unity.Flex.Worksheets;
+using Unity.Flex.Domain.Worksheets;
 using Unity.GrantManager.GrantApplications.Automation.Operations.FormWorksheet;
 using Xunit;
 
@@ -66,4 +67,16 @@ public void BuildWorksheet_Should_Create_One_SuggestedFields_Section_With_Defaul
         field.Order.ShouldBe(1u);
         field.Definition.ShouldContain("maxLength");
     }
+
+    [Fact]
+    public void EnsureCanonicalSuggestionWorksheetState_Should_Reject_Published_Worksheet()
+    {
+        var worksheet = new Worksheet(Guid.NewGuid(), "ai-form-worksheet", "AI Worksheet");
+        worksheet.SetPublished(true);
+
+        var exception = Should.Throw<InvalidOperationException>(() =>
+            FormWorksheetOperationExecutor.EnsureCanonicalSuggestionWorksheetState(worksheet));
+
+        exception.Message.ShouldContain("canonical AI suggestion worksheet is published");
+    }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantContactAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantContactAppServiceTests.cs
index cb89efdba1..fb4f54f65e 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantContactAppServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantContactAppServiceTests.cs
@@ -90,7 +90,8 @@ await _contactManager.Received(1).UpdateAsync(
                 applicantId,
                 contactId,
                 Arg.Is<ContactInput>(ci =>
-                    ci.Name == input.Name
+                    ci != null
+                    && ci.Name == input.Name
                     && ci.Title == input.Title
                     && ci.Email == input.Email
                     && ci.HomePhoneNumber == null
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceMappingReviewTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceMappingReviewTests.cs
new file mode 100644
index 0000000000..3587b58ea6
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceMappingReviewTests.cs
@@ -0,0 +1,307 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using NSubstitute;
+using Microsoft.Extensions.Localization;
+using Unity.AI.Localization;
+using Shouldly;
+using Unity.AI.Generation;
+using Unity.AI.Operations;
+using Unity.Flex.Domain.Worksheets;
+using Unity.Flex.Domain.WorksheetLinks;
+using Unity.Flex.Worksheets;
+using Unity.Flex.Domain.Scoresheets;
+using Unity.GrantManager.ApplicationForms.Mapping;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Forms;
+using Unity.GrantManager.Intakes;
+using Unity.GrantManager.Integrations.Chefs;
+using Unity.GrantManager.Reporting.FieldGenerators;
+using Unity.GrantManager.GrantApplications.Automation.Operations.FormMapping;
+using Unity.Modules.Shared.Correlation;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.ApplicationForms;
+
+public class ApplicationFormVersionAppServiceMappingReviewTests(ITestOutputHelper outputHelper)
+    : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public async Task AcceptMappingSuggestionsAsync_Should_Apply_Selected_Suggestions_And_Keep_Remaining()
+    {
+        var formVersionId = Guid.NewGuid();
+        var selectedSuggestionId = Guid.NewGuid();
+        var remainingSuggestionId = Guid.NewGuid();
+        var formVersion = new ApplicationFormVersion { SubmissionHeaderMapping = "{}" };
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        repository.GetAsync(formVersionId).Returns(formVersion);
+        var review = CreateReview(formVersionId, [
+            new FormMappingSuggestionDto
+            {
+                Id = selectedSuggestionId,
+                SourceField = "ChefsProjectName",
+                TargetField = "ProjectName"
+            },
+            new FormMappingSuggestionDto
+            {
+                Id = remainingSuggestionId,
+                SourceField = "ChefsAmount",
+                TargetField = "RequestedAmount"
+            }
+        ]);
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormMapping,
+                formVersionId)
+            .Returns(review);
+        var service = CreateService(repository, reviewRepository);
+
+        var result = await service.AcceptMappingSuggestionsAsync(formVersionId, new AcceptMappingSuggestionsDto
+        {
+            SuggestionIds = [selectedSuggestionId]
+        });
+
+        result.SubmissionHeaderMapping.ShouldContain("ProjectName");
+        formVersion.SubmissionHeaderMapping.ShouldContain("ProjectName");
+        formVersion.SubmissionHeaderMapping.ShouldContain("ChefsProjectName");
+        var payload = JsonSerializer.Deserialize<FormMappingReviewPayload>(review.ReviewData)!;
+        payload.PendingSuggestions.Select(suggestion => suggestion.Id).ShouldBe([remainingSuggestionId]);
+        await repository.Received(1).UpdateAsync(formVersion, true);
+        await reviewRepository.Received(1).UpdateAsync(review, true);
+    }
+
+    [Fact]
+    public async Task AcceptMappingSuggestionsAsync_Should_Leave_State_Unchanged_When_A_Suggestion_Is_Stale()
+    {
+        var formVersionId = Guid.NewGuid();
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        var review = CreateReview(formVersionId, [new FormMappingSuggestionDto { Id = Guid.NewGuid() }]);
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormMapping,
+                formVersionId)
+            .Returns(review);
+        var service = CreateService(repository, reviewRepository);
+
+        await Should.ThrowAsync<UserFriendlyException>(async () =>
+        {
+            await service.AcceptMappingSuggestionsAsync(
+                formVersionId,
+                new AcceptMappingSuggestionsDto { SuggestionIds = [Guid.NewGuid()] });
+        });
+
+        await repository.DidNotReceive().UpdateAsync(Arg.Any<ApplicationFormVersion>(), Arg.Any<bool>());
+        await reviewRepository.DidNotReceive().UpdateAsync(Arg.Any<GenerationReview>(), Arg.Any<bool>());
+    }
+
+    [Fact]
+    public async Task AcceptMappingSuggestionsAsync_Should_Replace_Source_And_Move_Conflicting_Target_In_Final_Review()
+    {
+        var formVersionId = Guid.NewGuid();
+        var suggestionId = Guid.NewGuid();
+        var formVersion = new ApplicationFormVersion
+        {
+            SubmissionHeaderMapping = "{\"TargetA\":\"SourceA\",\"TargetB\":\"SourceB\"}"
+        };
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        repository.GetAsync(formVersionId).Returns(formVersion);
+        var review = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormMapping, formVersionId, sequence: 2);
+        review.SetReviewData(JsonSerializer.Serialize(new FormMappingReviewPayload
+        {
+            PendingSuggestions =
+            [
+                new FormMappingSuggestionDto
+                {
+                    Id = suggestionId,
+                    SourceField = "SourceA",
+                    TargetField = "TargetB"
+                }
+            ]
+        }));
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormMapping, formVersionId)
+            .Returns(review);
+        var service = CreateService(repository, reviewRepository);
+
+        var result = await service.AcceptMappingSuggestionsAsync(formVersionId, new AcceptMappingSuggestionsDto
+        {
+            SuggestionIds = [suggestionId]
+        });
+
+        result.SubmissionHeaderMapping.ShouldBe("{\"TargetB\":\"SourceA\"}");
+    }
+
+    [Fact]
+    public void ClassifyFinalSuggestions_Should_Remove_Unchanged_And_Describe_Changes()
+    {
+        var suggestions = FormMappingOperationExecutor.ClassifyFinalSuggestions(
+            "{\"TargetA\":\"SourceA\",\"TargetB\":\"SourceB\"}",
+            [
+                new FormMappingSuggestionDto { SourceField = "SourceA", TargetField = "TargetA" },
+                new FormMappingSuggestionDto { SourceField = "SourceA", TargetField = "TargetB" },
+                new FormMappingSuggestionDto { SourceField = "SourceC", TargetField = "TargetC" }
+            ],
+            out var unchangedCount);
+
+        unchangedCount.ShouldBe(1);
+        suggestions.Count.ShouldBe(2);
+        suggestions[0].ChangeType.ShouldBe("Changed");
+        suggestions[0].PreviousTargetField.ShouldBe("TargetA");
+        suggestions[0].ConflictSourceField.ShouldBe("SourceB");
+        suggestions[1].ChangeType.ShouldBe("New");
+    }
+
+    [Fact]
+    public async Task FinalizeMappingReviewAsync_Should_Allow_Final_Mapping_When_One_Of_Multiple_Drafts_Is_Published_And_Assigned()
+    {
+        var formVersionId = Guid.NewGuid();
+        var formVersion = new ApplicationFormVersion { ApplicationFormId = Guid.NewGuid() };
+        var assignedDraft = new Worksheet(Guid.NewGuid(), "ai-assigned", "Assigned AI worksheet");
+        assignedDraft.SetPublished(true);
+        var unassignedDraft = new Worksheet(Guid.NewGuid(), "ai-unassigned", "Unassigned AI worksheet");
+        var mappingReview = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormMapping, formVersionId);
+        mappingReview.Complete();
+        var worksheetReview = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormWorksheet, formVersionId);
+        worksheetReview.Complete();
+        worksheetReview.SetReviewData(JsonSerializer.Serialize(new FormWorksheetReviewPayload
+        {
+            DraftWorksheetIds = [assignedDraft.Id, unassignedDraft.Id]
+        }));
+
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        repository.GetAsync(formVersionId).Returns(formVersion);
+        var generationService = Substitute.For<IAIGenerationAppService>();
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormMapping, formVersionId)
+            .Returns(mappingReview);
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormWorksheet, formVersionId)
+            .Returns(worksheetReview);
+        var worksheetRepository = Substitute.For<IWorksheetRepository>();
+        worksheetRepository.FindAsync(assignedDraft.Id).Returns(assignedDraft);
+        worksheetRepository.FindAsync(unassignedDraft.Id).Returns(unassignedDraft);
+        var worksheetLinkRepository = Substitute.For<IWorksheetLinkRepository>();
+        worksheetLinkRepository.GetListByCorrelationAsync(formVersionId, CorrelationConsts.FormVersion)
+            .Returns([
+                new WorksheetLink(Guid.NewGuid(), assignedDraft.Id, formVersionId, CorrelationConsts.FormVersion, string.Empty)
+            ]);
+        var service = CreateService(repository, reviewRepository, generationService, worksheetRepository, worksheetLinkRepository);
+
+        await service.FinalizeMappingReviewAsync(formVersionId);
+
+        mappingReview.Status.ShouldBe(GenerationReviewStatus.Completed);
+        await generationService.Received(1).SubmitAsync(
+            AIGenerationOperations.FormMapping,
+            Arg.Is<AIGenerationSubmissionDto>(submission =>
+                submission != null &&
+                submission.ApplicationFormVersionId == formVersionId &&
+                submission.ApplicationId == formVersion.ApplicationFormId));
+    }
+
+    [Fact]
+    public async Task GetMappingReviewAsync_Should_Complete_When_No_Worksheet_Suggestions_Were_Generated()
+    {
+        var formVersionId = Guid.NewGuid();
+        var mappingReview = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormMapping, formVersionId);
+        mappingReview.Complete();
+        var worksheetReview = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormWorksheet, formVersionId);
+        worksheetReview.SetReviewData(JsonSerializer.Serialize(new FormWorksheetReviewPayload
+        {
+            NoSuggestionsGenerated = true
+        }));
+        worksheetReview.Complete();
+
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormMapping, formVersionId)
+            .Returns(mappingReview);
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormWorksheet, formVersionId)
+            .Returns(worksheetReview);
+        var service = CreateService(repository, reviewRepository);
+
+        var result = await service.GetMappingReviewAsync(formVersionId);
+
+        result.State.ShouldBe(FormGenerationWorkflowState.Completed.ToString());
+        result.Action.ShouldBe(FormGenerationWorkflowAction.GenerateMapping.ToString());
+        result.CanGenerateFinalMapping.ShouldBeFalse();
+    }
+
+    [Fact]
+    public async Task FinalizeMappingReviewAsync_Should_Reject_When_No_Worksheet_Suggestions_Were_Generated()
+    {
+        var formVersionId = Guid.NewGuid();
+        var formVersion = new ApplicationFormVersion { ApplicationFormId = Guid.NewGuid() };
+        var mappingReview = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormMapping, formVersionId);
+        mappingReview.Complete();
+        var worksheetReview = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormWorksheet, formVersionId);
+        worksheetReview.SetReviewData(JsonSerializer.Serialize(new FormWorksheetReviewPayload
+        {
+            NoSuggestionsGenerated = true
+        }));
+        worksheetReview.Complete();
+
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        repository.GetAsync(formVersionId).Returns(formVersion);
+        var generationService = Substitute.For<IAIGenerationAppService>();
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormMapping, formVersionId)
+            .Returns(mappingReview);
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormWorksheet, formVersionId)
+            .Returns(worksheetReview);
+        var service = CreateService(repository, reviewRepository, generationService);
+
+        await Should.ThrowAsync<UserFriendlyException>(() => service.FinalizeMappingReviewAsync(formVersionId));
+
+        await generationService.DidNotReceive().SubmitAsync(
+            Arg.Any<string>(), Arg.Any<AIGenerationSubmissionDto>());
+    }
+
+    private static GenerationReview CreateReview(
+        Guid formVersionId,
+        System.Collections.Generic.List<FormMappingSuggestionDto> suggestions)
+    {
+        var review = new GenerationReview(
+            Guid.NewGuid(),
+            AIGenerationOperations.FormMapping,
+            formVersionId);
+        review.SetReviewData(JsonSerializer.Serialize(new FormMappingReviewPayload
+        {
+            PendingSuggestions = suggestions
+        }));
+        return review;
+    }
+
+    private ApplicationFormVersionAppService CreateService(
+        IRepository<ApplicationFormVersion, Guid> repository,
+        IGenerationReviewRepository reviewRepository,
+        IAIGenerationAppService? generationService = null,
+        IWorksheetRepository? worksheetRepository = null,
+        IWorksheetLinkRepository? worksheetLinkRepository = null)
+    {
+        var service = new ApplicationFormVersionAppService(
+            repository,
+            Substitute.For<IIntakeFormSubmissionMapper>(),
+            Substitute.For<IUnitOfWorkManager>(),
+            Substitute.For<IFormsApiService>(),
+            Substitute.For<IApplicationFormVersionRepository>(),
+            Substitute.For<IApplicationFormSubmissionRepository>(),
+            Substitute.For<IReportingFieldsGeneratorService>(),
+            Substitute.For<Volo.Abp.Features.IFeatureChecker>(),
+            Substitute.For<IStringLocalizer<AIResource>>(),
+            generationService ?? Substitute.For<IAIGenerationAppService>(),
+            worksheetRepository ?? Substitute.For<IWorksheetRepository>(),
+            Substitute.For<IRepository<CustomField, Guid>>(),
+            reviewRepository,
+            worksheetLinkRepository ?? Substitute.For<IWorksheetLinkRepository>(),
+            Substitute.For<IScoresheetRepository>(),
+            Substitute.For<Unity.Flex.Domain.WorksheetInstances.IWorksheetInstanceRepository>(),
+            Substitute.For<Unity.Flex.Domain.ScoresheetInstances.IScoresheetInstanceRepository>());
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+        return service;
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceTests.cs
index d37a007bc9..120c098fff 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicationForms/ApplicationFormVersionAppServiceTests.cs
@@ -1,4 +1,4 @@
-using NSubstitute;
+using NSubstitute;
 using Shouldly;
 using System;
 using System.Collections.Generic;
@@ -8,12 +8,15 @@
 using System.Threading.Tasks;
 using Unity.AI;
 using Unity.AI.Features;
+using Unity.AI.Localization;
+using Microsoft.Extensions.Localization;
 using Unity.AI.Generation;
 using Unity.AI.Operations;
 using Unity.AI.Requests;
 using Unity.AI.Responses;
 using Unity.Flex.Domain.Worksheets;
 using Unity.Flex.Worksheets;
+using Unity.Flex.Domain.Scoresheets;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.ApplicationForms.Mapping;
 using Unity.GrantManager.Applications;
@@ -61,6 +64,23 @@ await generationService.Received(1).SubmitAsync(
                 && request.ApplicationFormVersionId == formVersionId));
     }
 
+    [Fact]
+    public async Task GenerateMappingAsync_Should_Reject_When_Review_Is_Active()
+    {
+        var formVersionId = Guid.NewGuid();
+        var repository = Substitute.For<IRepository<ApplicationFormVersion, Guid>>();
+        repository.GetAsync(formVersionId).Returns(new ApplicationFormVersion { ApplicationFormId = Guid.NewGuid() });
+        var generationService = Substitute.For<IAIGenerationAppService>();
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormMapping, formVersionId)
+            .Returns(new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormMapping, formVersionId));
+        var service = CreateService(repository, generationService, generationReviewRepository: reviewRepository);
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+
+        await Should.ThrowAsync<Volo.Abp.UserFriendlyException>(() => service.GenerateMappingAsync(formVersionId));
+        await generationService.DidNotReceive().SubmitAsync(Arg.Any<string>(), Arg.Any<AIGenerationSubmissionDto>());
+    }
+
     [Fact]
     public void FormMappingPromptData_Should_UseEmptyObject_When_NoExistingMappingIsAvailable()
     {
@@ -69,6 +89,38 @@ public void FormMappingPromptData_Should_UseEmptyObject_When_NoExistingMappingIs
         promptData.GetProperty("existingMapping").GetRawText().ShouldBe("{}");
     }
 
+    [Fact]
+    public void FormMappingPromptData_Should_Include_Linked_Worksheet_Fields()
+    {
+        var promptData = FormMappingPromptDataBuilder.Build(new ApplicationFormMappingReadModelDto
+        {
+            Worksheets =
+            [
+                new WorksheetMappingFieldsDto
+                {
+                    WorksheetName = "Project details",
+                    Fields =
+                    [
+                        new MappingFieldDto
+                        {
+                            Name = "custom_project_name",
+                            Label = "Project name",
+                            Type = "String",
+                            IsCustom = true
+                        }
+                    ]
+                }
+            ]
+        });
+
+        promptData.GetProperty("unityData")
+            .GetProperty("customFields")[0]
+            .GetProperty("Fields")[0]
+            .GetProperty("Name")
+            .GetString()
+            .ShouldBe("custom_project_name");
+    }
+
     [Fact]
     public async Task GetPendingAiWorksheetAsync_Should_Return_Unpublished_Worksheet_Fields()
     {
@@ -83,12 +135,14 @@ public async Task GetPendingAiWorksheetAsync_Should_Return_Unpublished_Worksheet
         formVersionRepository.GetAsync(formVersionId).Returns(formVersion);
         var worksheetRepository = Substitute.For<IWorksheetRepository>();
         worksheetRepository.GetByNameAsync(Arg.Any<string>(), true).Returns(worksheet);
+        var reviewRepository = CreateActiveWorksheetReviewRepository(formVersionId);
 
         var service = CreateService(
             Substitute.For<IRepository<ApplicationFormVersion, Guid>>(),
             Substitute.For<IAIGenerationAppService>(),
             formVersionRepository,
-            worksheetRepository);
+            worksheetRepository,
+            generationReviewRepository: reviewRepository);
         service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
 
         var result = await service.GetPendingAiWorksheetAsync(formVersionId);
@@ -138,6 +192,7 @@ public async Task CreateAiWorksheetDraftAsync_Should_Create_Unlinked_Unpublished
         var worksheetRepository = Substitute.For<IWorksheetRepository>();
         worksheetRepository.GetByNameAsync(Arg.Any<string>(), true).Returns(worksheet);
         var customFieldRepository = Substitute.For<IRepository<CustomField, Guid>>();
+        var reviewRepository = CreateActiveWorksheetReviewRepository(formVersionId);
         Worksheet? createdDraft = null;
         worksheetRepository.InsertAsync(Arg.Do<Worksheet>(worksheet => createdDraft = worksheet), true)
             .Returns(Task.FromResult<Worksheet>(null!));
@@ -147,7 +202,8 @@ public async Task CreateAiWorksheetDraftAsync_Should_Create_Unlinked_Unpublished
             Substitute.For<IAIGenerationAppService>(),
             formVersionRepository,
             worksheetRepository,
-            customFieldRepository);
+            customFieldRepository,
+            generationReviewRepository: reviewRepository);
         service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
 
         var selectedFieldId = worksheet.Sections.Single().Fields.First().Id;
@@ -189,6 +245,7 @@ public async Task CreateAiWorksheetDraftAsync_Should_Number_Internal_Name_And_De
         var worksheetRepository = Substitute.For<IWorksheetRepository>();
         worksheetRepository.GetByNameAsync(Arg.Any<string>(), true).Returns(worksheet);
         var customFieldRepository = Substitute.For<IRepository<CustomField, Guid>>();
+        var reviewRepository = CreateActiveWorksheetReviewRepository(formVersionId);
         Worksheet? createdDraft = null;
         worksheetRepository.GetByNameAsync("ai-risk-review", false).Returns(new Worksheet(Guid.NewGuid(), "ai-risk-review", "Existing"));
         worksheetRepository.GetByNameAsync("ai-risk-review-2", false).Returns((Worksheet?)null);
@@ -200,7 +257,8 @@ public async Task CreateAiWorksheetDraftAsync_Should_Number_Internal_Name_And_De
             Substitute.For<IAIGenerationAppService>(),
             formVersionRepository,
             worksheetRepository,
-            customFieldRepository);
+            customFieldRepository,
+            generationReviewRepository: reviewRepository);
         service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
 
         await service.CreateAiWorksheetDraftAsync(formVersionId, new CreateAiWorksheetDraftDto
@@ -216,6 +274,60 @@ public async Task CreateAiWorksheetDraftAsync_Should_Number_Internal_Name_And_De
         await worksheetRepository.Received(1).DeleteAsync(worksheet, true);
     }
 
+    [Fact]
+    public async Task DiscardAiScoresheetSuggestionsAsync_Should_Preserve_Scoresheet_With_Instances()
+    {
+        var formVersionId = Guid.NewGuid();
+        var formId = Guid.NewGuid();
+        var formVersionRepository = Substitute.For<IApplicationFormVersionRepository>();
+        formVersionRepository.GetAsync(formVersionId).Returns(new ApplicationFormVersion { ApplicationFormId = formId });
+        var scoresheet = new Scoresheet(Guid.NewGuid(), "AI Scoresheet", $"ai-form-{formId}-version-{formVersionId}-scoresheet");
+        scoresheet.Instances.Add(new Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance(Guid.NewGuid(), scoresheet.Id, Guid.NewGuid(), "FormVersion"));
+        var scoresheetRepository = Substitute.For<IScoresheetRepository>();
+        scoresheetRepository.GetByNameAsync(Arg.Any<string>(), true).Returns(scoresheet);
+        var reviewRepository = Substitute.For<IGenerationReviewRepository>();
+        var scoresheetInstanceRepository = Substitute.For<Unity.Flex.Domain.ScoresheetInstances.IScoresheetInstanceRepository>();
+        scoresheetInstanceRepository.AnyByScoresheetAsync(scoresheet.Id).Returns(true);
+        var review = new GenerationReview(Guid.NewGuid(), AIGenerationOperations.FormScoresheet, formVersionId);
+        reviewRepository.FindLatestByOperationAndFormVersionAsync(AIGenerationOperations.FormScoresheet, formVersionId).Returns(review);
+
+        var service = CreateService(Substitute.For<IRepository<ApplicationFormVersion, Guid>>(), Substitute.For<IAIGenerationAppService>(), formVersionRepository, scoresheetRepository: scoresheetRepository, generationReviewRepository: reviewRepository, scoresheetInstanceRepository: scoresheetInstanceRepository);
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+
+        await Should.ThrowAsync<Volo.Abp.UserFriendlyException>(() => service.DiscardAiScoresheetSuggestionsAsync(formVersionId));
+        await scoresheetRepository.DidNotReceive().DeleteAsync(Arg.Any<Scoresheet>(), Arg.Any<bool>());
+    }
+    [Theory]
+    [InlineData(GenerationReviewStatus.Completed)]
+    [InlineData(GenerationReviewStatus.Discarded)]
+    public async Task GetPendingAiWorksheetAsync_Should_Return_Null_When_Review_Is_Not_Active(GenerationReviewStatus status)
+    {
+        var formVersionId = Guid.NewGuid();
+        var formId = Guid.NewGuid();
+        var formVersion = new ApplicationFormVersion { ApplicationFormId = formId };
+        var worksheet = BuildAiWorksheet(formId, formVersionId, published: false);
+        var formVersionRepository = Substitute.For<IApplicationFormVersionRepository>();
+        formVersionRepository.GetAsync(formVersionId).Returns(formVersion);
+        var worksheetRepository = Substitute.For<IWorksheetRepository>();
+        worksheetRepository.GetByNameAsync(Arg.Any<string>(), true).Returns(worksheet);
+        var reviewRepository = CreateActiveWorksheetReviewRepository(formVersionId);
+        var review = await reviewRepository.FindLatestByOperationAndFormVersionAsync(
+            AIGenerationOperations.FormWorksheet, formVersionId);
+        review!.SetStatus(status);
+
+        var service = CreateService(
+            Substitute.For<IRepository<ApplicationFormVersion, Guid>>(),
+            Substitute.For<IAIGenerationAppService>(),
+            formVersionRepository,
+            worksheetRepository,
+            generationReviewRepository: reviewRepository);
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+
+        var result = await service.GetPendingAiWorksheetAsync(formVersionId);
+
+        result.ShouldBeNull();
+    }
+
     private static Worksheet BuildAiWorksheet(Guid formId, Guid formVersionId, bool published, int fieldCount = 1)
     {
         var worksheet = new Worksheet(
@@ -309,7 +421,10 @@ private static ApplicationFormVersionAppService CreateService(
         IAIGenerationAppService aiGenerationAppService,
         IApplicationFormVersionRepository? formVersionRepository = null,
         IWorksheetRepository? worksheetRepository = null,
-        IRepository<CustomField, Guid>? customFieldRepository = null)
+        IRepository<CustomField, Guid>? customFieldRepository = null,
+        IGenerationReviewRepository? generationReviewRepository = null,
+        IScoresheetRepository? scoresheetRepository = null,
+        Unity.Flex.Domain.ScoresheetInstances.IScoresheetInstanceRepository? scoresheetInstanceRepository = null)
     {
         var featureChecker = Substitute.For<IFeatureChecker>();
         var service = new ApplicationFormVersionAppService(
@@ -321,9 +436,29 @@ private static ApplicationFormVersionAppService CreateService(
             Substitute.For<IApplicationFormSubmissionRepository>(),
             Substitute.For<IReportingFieldsGeneratorService>(),
             featureChecker,
+            Substitute.For<IStringLocalizer<AIResource>>(),
             aiGenerationAppService,
             worksheetRepository ?? Substitute.For<IWorksheetRepository>(),
-            customFieldRepository ?? Substitute.For<IRepository<CustomField, Guid>>());
+            customFieldRepository ?? Substitute.For<IRepository<CustomField, Guid>>(),
+            generationReviewRepository ?? Substitute.For<IGenerationReviewRepository>(),
+            Substitute.For<Unity.Flex.Domain.WorksheetLinks.IWorksheetLinkRepository>(),
+            scoresheetRepository ?? Substitute.For<IScoresheetRepository>(),
+            Substitute.For<Unity.Flex.Domain.WorksheetInstances.IWorksheetInstanceRepository>(),
+            scoresheetInstanceRepository ?? Substitute.For<Unity.Flex.Domain.ScoresheetInstances.IScoresheetInstanceRepository>());
         return service;
     }
+
+    private static IGenerationReviewRepository CreateActiveWorksheetReviewRepository(Guid formVersionId)
+    {
+        var repository = Substitute.For<IGenerationReviewRepository>();
+        var review = new GenerationReview(
+            Guid.NewGuid(),
+            AIGenerationOperations.FormWorksheet,
+            formVersionId);
+        repository.FindLatestByOperationAndFormVersionAsync(
+                AIGenerationOperations.FormWorksheet,
+                formVersionId)
+            .Returns(review);
+        return repository;
+    }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Contacts/ContactAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Contacts/ContactAppServiceTests.cs
index e375badf33..42c3501e75 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Contacts/ContactAppServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Contacts/ContactAppServiceTests.cs
@@ -300,7 +300,8 @@ await _contactManager.Received(1).CreateAsync(
                 input.RelatedEntityType,
                 input.RelatedEntityId,
                 Arg.Is<ContactInput>(ci =>
-                    ci.Name == input.Name
+                    ci != null
+                    && ci.Name == input.Name
                     && ci.Title == input.Title
                     && ci.Email == input.Email
                     && ci.HomePhoneNumber == input.HomePhoneNumber
@@ -391,7 +392,8 @@ await _contactManager.Received(1).UpdateAsync(
                 entityId,
                 contactId,
                 Arg.Is<ContactInput>(ci =>
-                    ci.Name == input.Name
+                    ci != null
+                    && ci.Name == input.Name
                     && ci.Title == input.Title
                     && ci.Email == input.Email
                     && ci.HomePhoneNumber == input.HomePhoneNumber
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/Generation/AIGenerationQueueTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/Generation/AIGenerationQueueTests.cs
index 5a4775bc3e..b4fb8e5f13 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/Generation/AIGenerationQueueTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/Generation/AIGenerationQueueTests.cs
@@ -106,7 +106,9 @@ private static IBackgroundJobManager CreateBackgroundJobManager(List<AIGeneratio
                 Arg.Any<TimeSpan?>())
             .Returns(callInfo =>
             {
-                jobs.Add(callInfo.Arg<AIGenerationBackgroundJobArgs>());
+                var job = callInfo.Arg<AIGenerationBackgroundJobArgs>();
+                ArgumentNullException.ThrowIfNull(job);
+                jobs.Add(job);
                 return Task.FromResult(string.Empty);
             });
         return backgroundJobManager;
@@ -141,11 +143,21 @@ private static ApplicationGenerationQueue CreateQueue(
         asyncQueryableExecuter.FirstOrDefaultAsync(
                 Arg.Any<IQueryable<AIOperation>>(),
                 Arg.Any<CancellationToken>())
-            .Returns(callInfo => Task.FromResult(callInfo.Arg<IQueryable<AIOperation>>().FirstOrDefault()));
+            .Returns(callInfo =>
+            {
+                var operations = callInfo.Arg<IQueryable<AIOperation>>();
+                ArgumentNullException.ThrowIfNull(operations);
+                return Task.FromResult(operations.FirstOrDefault());
+            });
         asyncQueryableExecuter.FirstOrDefaultAsync(
                 Arg.Any<IQueryable<AIGenerationRequest>>(),
                 Arg.Any<CancellationToken>())
-            .Returns(callInfo => Task.FromResult(callInfo.Arg<IQueryable<AIGenerationRequest>>().FirstOrDefault()));
+            .Returns(callInfo =>
+            {
+                var requests = callInfo.Arg<IQueryable<AIGenerationRequest>>();
+                ArgumentNullException.ThrowIfNull(requests);
+                return Task.FromResult(requests.FirstOrDefault());
+            });
 
         return new ApplicationGenerationQueue(
             backgroundJobManager,
@@ -221,4 +233,4 @@ public ValueTask DisposeAsync()
             return ValueTask.CompletedTask;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/AIExecutionModeResolverTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/AIExecutionModeResolverTests.cs
index 9396267b19..b49e567b32 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/AIExecutionModeResolverTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/AIExecutionModeResolverTests.cs
@@ -24,7 +24,9 @@ public async Task ResolveMode_Uses_Persisted_Operation_Mode()
                 cancellationToken: Arg.Any<CancellationToken>())
             .Returns(callInfo =>
             {
-                var predicate = callInfo.Arg<Expression<Func<AIOperation, bool>>>();
+                var predicateExpression = callInfo.Arg<Expression<Func<AIOperation, bool>>>();
+                ArgumentNullException.ThrowIfNull(predicateExpression);
+                var predicate = predicateExpression.Compile();
                 return Task.FromResult(new[]
                 {
                     new AIOperation(Guid.NewGuid(), AIPromptTypes.ApplicationScoring, Guid.NewGuid())
@@ -32,7 +34,7 @@ public async Task ResolveMode_Uses_Persisted_Operation_Mode()
                         ExecutionMode = AIExecutionMode.Batch,
                         IsActive = true
                     }
-                }.Where(predicate.Compile()).ToList());
+                }.Where(predicate).ToList());
             });
 
         var resolver = new AIExecutionModeResolver(repository);
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/ApplicationScoringServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/ApplicationScoringServiceTests.cs
index a5911fb7e7..a3e154d85e 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/ApplicationScoringServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Operations/ApplicationScoringServiceTests.cs
@@ -35,7 +35,9 @@ public async Task RegenerateAsync_Sequential_Mode_Uses_Per_Section_Requests()
                 cancellationToken: Arg.Any<CancellationToken>())
             .Returns(callInfo =>
             {
-                var predicate = callInfo.Arg<System.Linq.Expressions.Expression<Func<AIOperation, bool>>>();
+                var predicateExpression = callInfo.Arg<System.Linq.Expressions.Expression<Func<AIOperation, bool>>>();
+                ArgumentNullException.ThrowIfNull(predicateExpression);
+                var predicate = predicateExpression.Compile();
                 return Task.FromResult(new[]
                 {
                     new AIOperation(Guid.NewGuid(), AIPromptTypes.ApplicationScoring, Guid.NewGuid())
@@ -43,7 +45,7 @@ public async Task RegenerateAsync_Sequential_Mode_Uses_Per_Section_Requests()
                         ExecutionMode = AIExecutionMode.Sequential,
                         IsActive = true
                     }
-                }.Where(predicate.Compile()).ToList());
+                }.Where(predicate).ToList());
             });
 
         var service = new ApplicationScoringService(
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Runtime/Execution/AIProviderPayloadValidatorTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Runtime/Execution/AIProviderPayloadValidatorTests.cs
index fbb0b5a392..b63570adb1 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Runtime/Execution/AIProviderPayloadValidatorTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Runtime/Execution/AIProviderPayloadValidatorTests.cs
@@ -52,7 +52,7 @@ public void ValidateApplicationScoringJson_Should_Return_InvalidOutput_When_Answ
 
         result.IsValid.ShouldBeFalse();
         result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
-        result.Reason.ShouldContain("q1");
+        result.Reason!.ShouldContain("q1");
     }
 
     [Fact]
@@ -96,7 +96,7 @@ public void ValidateApplicationAnalysisJson_Should_Return_InvalidOutput_When_Dec
 
         result.IsValid.ShouldBeFalse();
         result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
-        result.Reason.ShouldContain("Expected 'PROCEED' or 'HOLD'");
+        result.Reason!.ShouldContain("Expected 'PROCEED' or 'HOLD'");
     }
 
     [Fact]
@@ -223,6 +223,29 @@ public void ValidateFormScoresheetJson_Should_Allow_Empty_Optional_Reporting_Fie
         result.IsValid.ShouldBeTrue();
     }
 
+    [Fact]
+    public void ValidateFormScoresheetJson_Should_Allow_Mixed_Property_Casing()
+    {
+        var response = ValidFormScoresheetJson
+            .Replace("\"Title\"", "\"title\"", StringComparison.Ordinal)
+            .Replace("\"Name\"", "\"name\"", StringComparison.Ordinal)
+            .Replace("\"Version\"", "\"version\"", StringComparison.Ordinal)
+            .Replace("\"Order\"", "\"order\"", StringComparison.Ordinal)
+            .Replace("\"Published\"", "\"published\"", StringComparison.Ordinal)
+            .Replace("\"Sections\"", "\"sections\"", StringComparison.Ordinal)
+            .Replace("\"Fields\"", "\"fields\"", StringComparison.Ordinal)
+            .Replace("\"ReportColumns\"", "\"reportColumns\"", StringComparison.Ordinal)
+            .Replace("\"ReportKeys\"", "\"reportKeys\"", StringComparison.Ordinal)
+            .Replace("\"ReportViewName\"", "\"reportViewName\"", StringComparison.Ordinal)
+            .Replace("\"Description\"", "\"description\"", StringComparison.Ordinal)
+            .Replace("\"Type\"", "\"type\"", StringComparison.Ordinal)
+            .Replace("\"Definition\"", "\"definition\"", StringComparison.Ordinal);
+
+        var result = AIProviderPayloadValidator.ValidateFormScoresheetJson(response);
+
+        result.IsValid.ShouldBeTrue();
+    }
+
     [Theory]
     [InlineData("\"Title\": \"Generated scoresheet\"", "\"Title\": \"\"")]
     [InlineData("\"Version\": 1", "\"Version\": \"1\"")]
@@ -247,7 +270,7 @@ public void ValidateFormScoresheetJson_Should_Return_InvalidOutput_For_Duplicate
         var result = AIProviderPayloadValidator.ValidateFormScoresheetJson(response);
 
         result.IsValid.ShouldBeFalse();
-        result.Reason.ShouldContain("duplicate field names");
+        result.Reason!.ShouldContain("duplicate field names");
     }
 
     [Fact]
@@ -261,7 +284,7 @@ public void ValidateFormScoresheetJson_Should_Return_InvalidOutput_For_Duplicate
         var result = AIProviderPayloadValidator.ValidateFormScoresheetJson(response);
 
         result.IsValid.ShouldBeFalse();
-        result.Reason.ShouldContain("duplicate section names");
+        result.Reason!.ShouldContain("duplicate section names");
     }
 
     private const string ValidFormScoresheetJson = """