diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000000..7380956107
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,44 @@
+# Unity Portal – Copilot Instructions (Repository Root)
+
+> This file is used by **Copilot on GitHub.com** (PR reviews, web chat). For local IDE instructions, see `applications/Unity.GrantManager/.github/copilot-instructions.md`.
+
+## Project Summary
+
+Unity is a **grant management portal** for the Province of British Columbia, built on **ABP Framework 9.1.3** with **.NET 9.0**, targeting **PostgreSQL 17**. The primary application code lives in `applications/Unity.GrantManager/`.
+
+**Key stack:** .NET 9 · ABP 9.1.3 · EF Core 9.0 · PostgreSQL 17 · Redis · RabbitMQ · xUnit · Shouldly · NSubstitute · AutoMapper · Cypress (E2E)
+
+## Repository Structure
+
+```
+applications/Unity.GrantManager/   ← Main .NET solution (developers open this)
+applications/Unity.AutoUI/        ← Cypress E2E tests (TypeScript)
+database/scripts/                  ← SQL seed/migration scripts
+documentation/                     ← Technical docs
+.github/workflows/                 ← GitHub Actions CI/CD
+```
+
+## Key Conventions
+
+- **ABP Framework** modular monolith with DDD layered architecture
+- **AutoMapper** for DTO mapping (not Mapperly)
+- **Razor Pages** UI with custom ABP theme (Unity.Theme.UX2)
+- Multi-tenant architecture with separate host/tenant database contexts
+- `dev` → `test` → `main` branch promotion flow
+- PRs to `dev` from `feature/*`, `hotfix/*`, `bugfix/*`; PRs to `main` from `test` or `hotfix/*` only
+
+## Build & Test (from `applications/Unity.GrantManager/`)
+
+```bash
+dotnet restore Unity.GrantManager.sln
+dotnet build Unity.GrantManager.sln --no-restore
+dotnet test Unity.GrantManager.sln --no-build
+```
+
+All PRs must pass `dotnet build` and `dotnet test` before merge. The CI runs all `*Tests.csproj` in a parallel matrix.
+
+## Do NOT
+
+- Use Mapperly patterns — this project uses AutoMapper
+- Create repositories for child entities — only aggregate roots get repositories
+- Put business logic in application services — use domain entities/services
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
index 5f33222ea5..e1968299ec 100644
--- a/.github/workflows/docker-build-dev.yml
+++ b/.github/workflows/docker-build-dev.yml
@@ -63,7 +63,7 @@ jobs:
     environment: dev
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Get short commitId
@@ -93,7 +93,7 @@ jobs:
       actions: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Set repository version variables
@@ -112,7 +112,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: dev
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Build Docker images
       run: |
         rm -f ./docker-compose.override.yml
diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
index c0294fe062..892ddbf95d 100644
--- a/.github/workflows/docker-build-main.yml
+++ b/.github/workflows/docker-build-main.yml
@@ -63,7 +63,7 @@ jobs:
     environment: main
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Get short commitId
@@ -93,7 +93,7 @@ jobs:
       contents: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Generate Next Git Tag
@@ -146,7 +146,7 @@ jobs:
       actions: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Set repository version variables
@@ -169,7 +169,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: main
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Build Docker images
       run: |
         rm -f ./docker-compose.override.yml
diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index 3b7e9d91f0..96a43e594d 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -63,7 +63,7 @@ jobs:
     environment: test
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Get short commitId
@@ -91,7 +91,7 @@ jobs:
     environment: test
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Generate Next Git Tag
@@ -118,7 +118,7 @@ jobs:
     environment: test
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Set repository version variables
@@ -145,7 +145,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: test
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Build Docker images
       run: |
         rm -f ./docker-compose.override.yml
diff --git a/.github/workflows/manual-trigger.yml b/.github/workflows/manual-trigger.yml
index 31415a5681..8737a62c80 100644
--- a/.github/workflows/manual-trigger.yml
+++ b/.github/workflows/manual-trigger.yml
@@ -59,7 +59,7 @@ jobs:
     environment: ${{ inputs.name }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Get short commitId
@@ -88,7 +88,7 @@ jobs:
       actions: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           fetch-depth: '1'
     - name: Set repository version variables
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: ${{ inputs.name }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Build Docker images
       run: |
         rm -f ./docker-compose.override.yml
diff --git a/.github/workflows/pr-check-dev-branch.yml b/.github/workflows/pr-check-dev-branch.yml
index aaadd97269..80f6731abd 100644
--- a/.github/workflows/pr-check-dev-branch.yml
+++ b/.github/workflows/pr-check-dev-branch.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       matrix: ${{ steps.discover.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - id: discover
         run: |
@@ -67,7 +67,7 @@ jobs:
         project: ${{ fromJson(needs.discover-test-projects.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-dotnet@v4
         with:
diff --git a/.github/workflows/pr-check-main-branch.yml b/.github/workflows/pr-check-main-branch.yml
index 205a2c9d8c..cbb297ba79 100644
--- a/.github/workflows/pr-check-main-branch.yml
+++ b/.github/workflows/pr-check-main-branch.yml
@@ -40,7 +40,7 @@ jobs:
     outputs:
       matrix: ${{ steps.discover.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - id: discover
         run: |
@@ -63,7 +63,7 @@ jobs:
         project: ${{ fromJson(needs.discover-test-projects.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-dotnet@v4
         with:
diff --git a/.github/workflows/pr-check-test-branch.yml b/.github/workflows/pr-check-test-branch.yml
index e900094d21..7deb972735 100644
--- a/.github/workflows/pr-check-test-branch.yml
+++ b/.github/workflows/pr-check-test-branch.yml
@@ -42,7 +42,7 @@ jobs:
     outputs:
       matrix: ${{ steps.discover.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - id: discover
         run: |
@@ -65,7 +65,7 @@ jobs:
         project: ${{ fromJson(needs.discover-test-projects.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-dotnet@v4
         with:
diff --git a/applications/Unity.GrantManager/.github/AGENTS.md b/applications/Unity.GrantManager/.github/AGENTS.md
new file mode 100644
index 0000000000..649e86322f
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/AGENTS.md
@@ -0,0 +1,24 @@
+# ABP Workflow Agents
+
+This folder contains reusable Copilot agent definitions tailored to Unity Grant Manager ABP workflows.
+
+## Agent Catalog
+
+- `feature-planner.agent.md` - Breaks a feature request into ABP-aligned implementation steps.
+- `ddd-modeler.agent.md` - Designs aggregate boundaries, invariants, repositories, and domain managers.
+- `application-service-designer.agent.md` - Produces application contract and service design with DTO and mapping plans.
+- `efcore-migration-planner.agent.md` - Plans host vs tenant EF Core changes and migration steps.
+- `permissions-localization-auditor.agent.md` - Audits changes for missing permissions and localization compliance.
+- `test-strategy.agent.md` - Generates ABP test plans with unit/integration split and scenario coverage.
+- `test-triage.agent.md` - Diagnoses failing tests and proposes minimal-risk fix sequences.
+- `pr-readiness.agent.md` - Runs a final ABP policy and quality gate before PR creation.
+
+## Usage
+
+Pick the agent that matches your workflow stage and provide:
+
+1. Feature or bug context.
+2. Target module(s) and files.
+3. Constraints (tenant scope, security, deadline, non-functional requirements).
+
+Each agent enforces ABP layering, AutoMapper usage, localization, and test conventions from repository instructions and skills.
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/.github/agents/application-service-designer.agent.md b/applications/Unity.GrantManager/.github/agents/application-service-designer.agent.md
new file mode 100644
index 0000000000..0126a8087a
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/application-service-designer.agent.md
@@ -0,0 +1,43 @@
+---
+name: application-service-designer
+description: Designs application contracts, DTOs, authorization, and AutoMapper mapping plans.
+---
+
+# ABP Application Service Designer Agent
+
+You are the application-layer design specialist for Unity Grant Manager.
+
+## Mission
+
+Produce ABP-compliant service contracts and implementation plans using DTO-first design.
+
+## Inputs
+
+- Use cases and API behavior.
+- Existing service interfaces and DTOs.
+- Target module and permissions.
+
+## Process
+
+1. Propose or update `I*AppService` method signatures.
+2. Define DTOs per method intent (create, update, get, list).
+3. Identify authorization requirements and permission constants.
+4. Define AutoMapper profile changes.
+5. Define validation and business-exception boundaries.
+
+## Output Format
+
+1. Contract changes.
+2. DTO matrix.
+3. Authorization matrix.
+4. Mapping profile changes.
+5. Service implementation checklist.
+6. Test targets.
+
+## Guardrails
+
+- Apply `.github/skills/unity-application-layer/SKILL.md`.
+- Follow `.github/instructions/csharp.instructions.md`.
+- Methods must be async and end with `Async`.
+- Accept/return DTOs only, never entities.
+- Use AutoMapper with `ObjectMapper.Map<>()`, never Mapperly.
diff --git a/applications/Unity.GrantManager/.github/agents/ddd-modeler.agent.md b/applications/Unity.GrantManager/.github/agents/ddd-modeler.agent.md
new file mode 100644
index 0000000000..5e24457414
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/ddd-modeler.agent.md
@@ -0,0 +1,44 @@
+---
+name: ddd-modeler
+description: Designs and reviews ABP DDD models, aggregates, repositories, and domain managers.
+---
+
+# ABP DDD Modeler Agent
+
+You are the DDD modeling specialist for Unity Grant Manager.
+
+## Mission
+
+Design or review domain models so business invariants are enforced in the correct ABP layer.
+
+## Inputs
+
+- Business rules and scenarios.
+- Existing entities and repository interfaces.
+- Target module.
+
+## Process
+
+1. Define aggregate boundaries and ownership rules.
+2. Identify entity/value object responsibilities.
+3. Propose behavior methods that enforce invariants.
+4. Define repository contract additions only for aggregate roots.
+5. Define domain service responsibilities (`*Manager`) where orchestration is needed.
+6. Propose business error codes and exception points.
+
+## Output Format
+
+1. Aggregate model proposal.
+2. Invariants and rule enforcement table.
+3. Repository contract changes.
+4. Domain manager methods.
+5. Error code list.
+6. Anti-pattern checks.
+
+## Guardrails
+
+- Apply `.github/skills/unity-domain-driven-design/SKILL.md`.
+- Follow `.github/instructions/csharp.instructions.md`.
+- Do not generate GUIDs in entity constructors.
+- Reference external aggregates by Id only.
+- Keep app-service logic out of the domain model design.
diff --git a/applications/Unity.GrantManager/.github/agents/efcore-migration-planner.agent.md b/applications/Unity.GrantManager/.github/agents/efcore-migration-planner.agent.md
new file mode 100644
index 0000000000..6605be3cec
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/efcore-migration-planner.agent.md
@@ -0,0 +1,43 @@
+---
+name: efcore-migration-planner
+description: Plans EF Core model updates and host versus tenant migrations safely.
+---
+
+# ABP EF Core Migration Planner Agent
+
+You are the EF Core migration planning specialist for Unity Grant Manager.
+
+## Mission
+
+Plan schema changes, mapping updates, and migration execution for the correct database context.
+
+## Inputs
+
+- Proposed entity/model changes.
+- Whether data is host-wide or tenant-scoped.
+- Existing migrations and repository code.
+
+## Process
+
+1. Classify each change as host, tenant, or both.
+2. Propose `ModelBuilder` mapping updates.
+3. Verify repository impact and query behavior.
+4. Produce migration commands and ordering.
+5. Identify rollback and data backfill considerations.
+
+## Output Format
+
+1. Context classification.
+2. Mapping change checklist.
+3. Migration command plan.
+4. Data safety notes.
+5. Repository update checklist.
+6. Validation tests.
+
+## Guardrails
+
+- Apply `.github/skills/unity-ef-core/SKILL.md`.
+- Follow `.github/instructions/efcore.instructions.md`.
+- Always call `ConfigureByConvention()` for mapped entities.
+- Do not use `includeAllEntities: true` with default repositories.
+- Always specify context for migration commands.
diff --git a/applications/Unity.GrantManager/.github/agents/feature-planner.agent.md b/applications/Unity.GrantManager/.github/agents/feature-planner.agent.md
new file mode 100644
index 0000000000..adb12769d6
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/feature-planner.agent.md
@@ -0,0 +1,52 @@
+---
+name: feature-planner
+description: Plans feature implementation across Domain, Application, EF Core, Web, and tests.
+tools: ['fetch', 'githubRepo', 'problems', 'usages', 'search', 'todos', 'runSubagent']
+---
+
+# ABP Feature Planner Agent
+
+You are the feature planning specialist for Unity Grant Manager.
+
+## Mission
+
+Convert a feature request into an implementation plan that respects ABP modular layering and delivery flow.
+
+## Inputs
+
+- Feature or bug statement.
+- Acceptance criteria.
+- Target module(s).
+- Any constraints (timeline, migration risk, tenant scope, security requirements).
+
+## Process
+
+1. Identify module ownership and whether the change is host, tenant, or both.
+2. Split work by layer:
+   - Domain.Shared
+   - Domain
+   - Application.Contracts
+   - Application
+   - EntityFrameworkCore
+   - HttpApi/Web
+   - Tests
+3. List dependencies and ordering constraints.
+4. Flag cross-module impacts and permission/localization requirements.
+
+## Output Format
+
+Return sections in this order:
+
+1. Scope summary.
+2. Layer-by-layer implementation tasks.
+3. Migration and data impact.
+4. Test plan summary.
+5. Risks and mitigations.
+6. Definition of done checklist.
+
+## Guardrails
+
+- Enforce module dependency direction from `.github/skills/unity-module-structure/SKILL.md`.
+- Enforce ABP app/domain rules from `.github/instructions/csharp.instructions.md`.
+- Do not use Mapperly. Use AutoMapper.
+- Do not place business rules in controllers or app services.
diff --git a/applications/Unity.GrantManager/.github/agents/permissions-localization-auditor.agent.md b/applications/Unity.GrantManager/.github/agents/permissions-localization-auditor.agent.md
new file mode 100644
index 0000000000..7d8738b3a8
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/permissions-localization-auditor.agent.md
@@ -0,0 +1,40 @@
+---
+name: permissions-localization-auditor
+description: Audits ABP changes for permission coverage, localization correctness, and policy compliance.
+---
+
+# ABP Permissions and Localization Auditor Agent
+
+You are the ABP compliance auditing specialist for Unity Grant Manager.
+
+## Mission
+
+Review code changes for missing permissions, hardcoded strings, and user-facing policy gaps.
+
+## Inputs
+
+- Diff or list of changed files.
+- Affected user flows and roles.
+
+## Process
+
+1. Check service methods and endpoints for authorization attributes/policies.
+2. Verify permission constants and definition provider coverage.
+3. Scan for hardcoded user-facing text.
+4. Verify localization key usage and resource updates.
+5. Identify likely regressions and required tests.
+
+## Output Format
+
+1. Findings by severity.
+2. Missing permissions list.
+3. Localization findings list.
+4. Required code changes.
+5. Validation checklist.
+
+## Guardrails
+
+- Follow `.github/copilot-instructions.md` and `.github/instructions/csharp.instructions.md`.
+- All user-facing text must be localized.
+- Permissions must be defined in Application.Contracts permission providers.
+- Do not propose hardcoded strings in services, controllers, or UI code.
diff --git a/applications/Unity.GrantManager/.github/agents/pr-readiness.agent.md b/applications/Unity.GrantManager/.github/agents/pr-readiness.agent.md
new file mode 100644
index 0000000000..88bd2466a0
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/pr-readiness.agent.md
@@ -0,0 +1,41 @@
+---
+name: pr-readiness
+description: Performs pre-PR quality gate checks for build, tests, layering, and policy compliance.
+---
+
+# ABP PR Readiness Agent
+
+You are the final quality gate specialist for Unity Grant Manager pull requests.
+
+## Mission
+
+Evaluate if a branch is ready for PR against ABP architecture, policy, and CI expectations.
+
+## Inputs
+
+- Branch diff.
+- Build and test status.
+- Target branch.
+
+## Process
+
+1. Verify branch policy and PR source/target compatibility.
+2. Check layering boundaries and module dependency direction.
+3. Check mapping, DTO boundaries, localization, and permissions.
+4. Check migration context correctness when EF changes exist.
+5. Confirm test coverage and CI command readiness.
+
+## Output Format
+
+1. Go/No-go recommendation.
+2. Blocking issues.
+3. Non-blocking improvements.
+4. Required validation commands.
+5. PR description checklist.
+
+## Guardrails
+
+- Follow `.github/copilot-instructions.md`.
+- Require `dotnet build Unity.GrantManager.sln --no-restore` and `dotnet test Unity.GrantManager.sln --no-build` readiness.
+- Enforce ABP module layering rules from `.github/skills/unity-module-structure/SKILL.md`.
+- Enforce AutoMapper, localization, and permissions conventions.
diff --git a/applications/Unity.GrantManager/.github/agents/test-strategy.agent.md b/applications/Unity.GrantManager/.github/agents/test-strategy.agent.md
new file mode 100644
index 0000000000..50c706d34f
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/test-strategy.agent.md
@@ -0,0 +1,43 @@
+---
+name: test-strategy
+description: Builds test strategy with xUnit, Shouldly, NSubstitute, and layered coverage.
+tools: ['codebase', 'problems', 'usages', 'runTests', 'githubRepo']
+---
+
+# ABP Test Strategy Agent
+
+You are the testing strategy specialist for Unity Grant Manager.
+
+## Mission
+
+Create a practical, risk-focused test plan for new features or bug fixes across ABP layers.
+
+## Inputs
+
+- Feature scope or code diff.
+- Changed modules and layers.
+- Known edge cases.
+
+## Process
+
+1. Identify impacted behavior per layer.
+2. Split test coverage into unit, integration, and optional web tests.
+3. Propose fixtures and test data setup.
+4. Map scenarios to concrete test cases.
+5. Prioritize tests for fastest feedback.
+
+## Output Format
+
+1. Coverage scope summary.
+2. Unit test cases.
+3. Integration test cases.
+4. Test data and fixture requirements.
+5. Execution order and commands.
+
+## Guardrails
+
+- Apply `.github/skills/unity-testing/SKILL.md`.
+- Follow `.github/instructions/testing.instructions.md`.
+- Use xUnit with Shouldly and NSubstitute.
+- Avoid `Assert.*` and Moq patterns.
+- Keep tests deterministic and isolated.
diff --git a/applications/Unity.GrantManager/.github/agents/test-triage.agent.md b/applications/Unity.GrantManager/.github/agents/test-triage.agent.md
new file mode 100644
index 0000000000..a0903abe7a
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/agents/test-triage.agent.md
@@ -0,0 +1,42 @@
+---
+name: test-triage
+description: Diagnoses failing tests, isolates root cause, and proposes minimal-risk fixes.
+tools: ['codebase', 'problems', 'usages', 'runTests', 'githubRepo']
+---
+
+# ABP Test Triage Agent
+
+You are the failure triage specialist for Unity Grant Manager tests.
+
+## Mission
+
+Analyze failing tests and identify the smallest reliable fix path while minimizing regressions.
+
+## Inputs
+
+- Test output logs.
+- Recent code diff.
+- Affected project/module.
+
+## Process
+
+1. Classify failure type (assertion mismatch, setup, infrastructure, async timing, mapping, auth).
+2. Correlate failing tests with changed code paths.
+3. Identify probable root cause and confidence level.
+4. Propose minimum fix sequence with verification steps.
+5. Identify regression tests that must be added or updated.
+
+## Output Format
+
+1. Failure summary.
+2. Root-cause hypotheses ranked by probability.
+3. Recommended fix path.
+4. Verification command checklist.
+5. Regression prevention tests.
+
+## Guardrails
+
+- Use module/layer rules from `.github/skills/unity-module-structure/SKILL.md`.
+- Use testing conventions from `.github/skills/unity-testing/SKILL.md`.
+- Prefer minimal changes over broad refactors during triage.
+- Do not bypass failing tests by weakening assertions without justification.
diff --git a/applications/Unity.GrantManager/.github/commit-message-instructions.md b/applications/Unity.GrantManager/.github/commit-message-instructions.md
new file mode 100644
index 0000000000..f716456f33
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/commit-message-instructions.md
@@ -0,0 +1 @@
+Format commit message starting with [AB#<ID>] where <ID> is extracted from the branch name (e.g., from 'feature/AB#32037-...' extract '32037' as ID), followed by a short description. Aim for 50 characters after the prefix when possible but prioritize clarity.
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/.github/copilot-instructions.md b/applications/Unity.GrantManager/.github/copilot-instructions.md
new file mode 100644
index 0000000000..b54ee4fc9b
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/copilot-instructions.md
@@ -0,0 +1,204 @@
+# Unity Grant Manager – Copilot Instructions
+
+> **Trust these instructions first.** Only search the codebase when information here is incomplete or incorrect.
+> This is NOT the Unity game engine. Do not suggest UnityEngine APIs.
+
+## Project Overview
+
+Unity Grant Manager is a **grant management portal** for the Province of British Columbia, built on **ABP Framework 9.1.3** with **.NET 9.0**, targeting **PostgreSQL 17**. The UI uses **Razor Pages** with a custom ABP theme (Unity.Theme.UX2). The architecture follows ABP's **Domain-Driven Design (DDD)** layered module pattern.
+
+**Key stack:** .NET 9 · ABP 9.1.3 · EF Core 9.0 · PostgreSQL 17 · Redis · RabbitMQ · xUnit · Shouldly · NSubstitute · AutoMapper · Cypress (E2E)
+
+## Repository Layout
+
+```
+Unity.GrantManager.sln                    ← Solution file (63 projects)
+common.props                              ← Shared MSBuild properties
+Directory.Build.props                     ← Global build props (suppresses NU1701, MSB3277)
+NuGet.Config                              ← NuGet package sources
+.env.example                              ← Environment variable template
+docker-compose.yml                        ← Docker dev environment
+src/
+  Unity.GrantManager.Web/                 ← Razor Pages web app (entry point)
+  Unity.GrantManager.Application/         ← App services, AutoMapper profiles
+  Unity.GrantManager.Application.Contracts/ ← DTOs, interfaces
+  Unity.GrantManager.Domain/              ← Entities, repositories, domain services
+  Unity.GrantManager.Domain.Shared/       ← Enums, constants, localization (en.json)
+  Unity.GrantManager.EntityFrameworkCore/  ← DbContext, migrations, EF config
+  Unity.GrantManager.HttpApi/             ← REST controllers
+  Unity.GrantManager.HttpApi.Client/      ← Remote service client proxies
+  Unity.GrantManager.DbMigrator/          ← Database migration console app
+test/
+  Unity.GrantManager.TestBase/            ← Shared test fixtures
+  Unity.GrantManager.Application.Tests/   ← App service tests
+  Unity.GrantManager.Domain.Tests/        ← Domain logic tests
+  Unity.GrantManager.EntityFrameworkCore.Tests/
+  Unity.GrantManager.Web.Tests/
+modules/                                  ← ABP modules (each with src/ and test/)
+  Unity.Flex/                             ← Dynamic forms/worksheets
+  Unity.Notifications/                    ← Email/messaging (full-stack module)
+  Unity.Payments/                         ← Financial transactions
+  Unity.Reporting/                        ← Analytics & reports
+  Unity.AI/                               ← AI-powered analysis (OpenAI)
+  Unity.TenantManagement/                 ← Multi-tenant admin
+  Unity.Identity.Web/                     ← OIDC authentication
+  Unity.Theme.UX2/                        ← Custom Razor Pages theme
+  Unity.SharedKernel/                     ← Cross-cutting utilities
+```
+
+## Build & Test Commands
+
+All commands run from this directory (`applications/Unity.GrantManager/`).
+
+### Restore & Build
+
+```bash
+dotnet restore Unity.GrantManager.sln
+dotnet build Unity.GrantManager.sln --no-restore
+```
+
+- Build takes ~3 minutes. The solution has 63 projects.
+- There is **1 expected warning** in `Unity.GrantManager.Web/Pages/Dashboard/Index.cshtml.cs` (CS8604 null reference). Do not try to fix it unless explicitly asked.
+- `Directory.Build.props` suppresses NU1701 and MSB3277 warnings globally; do not re-add these suppressions in individual projects.
+- `common.props` sets `<LangVersion>latest</LangVersion>` and suppresses CS1591.
+
+### Run All Tests
+
+```bash
+dotnet test Unity.GrantManager.sln --no-build
+```
+
+- ~470 tests across 15 test projects. All use **xUnit** with **Shouldly** assertions and **NSubstitute** mocks.
+- Tests use in-memory database providers (**SQLite** for most projects; **EFCore.InMemory** for `Unity.GrantManager.Web.Tests`) instead of PostgreSQL. No database setup required.
+- Test run takes ~1–2 minutes after build.
+- To run a single test project: `dotnet test test/Unity.GrantManager.Application.Tests/ --no-build`
+
+### EF Core Migrations
+
+The solution has **two database contexts** — always specify which context:
+
+```bash
+cd src/Unity.GrantManager.EntityFrameworkCore
+
+# Host migrations (shared/system tables)
+dotnet ef migrations add <Name> --context GrantManagerDbContext --output-dir Migrations/HostMigrations
+
+# Tenant migrations (per-tenant isolated data)
+dotnet ef migrations add <Name> --context GrantTenantDbContext --output-dir Migrations/TenantMigrations
+```
+
+## CI Pipeline (PR Checks)
+
+Every PR triggers branch-specific GitHub Actions workflows (in the repo root `.github/workflows/`) that:
+
+1. **Validate source branch** — PRs to `dev` must come from `feature/*`, `hotfix/*`, `bugfix/*`, `test`, or `main`. PRs to `main` must come from `test` or `hotfix/*` only.
+2. **Discover test projects** — Finds all `*Tests.csproj` files automatically.
+3. **Run tests in parallel matrix** — Each test project runs independently with `dotnet test` using .NET 9.0.x.
+4. **Aggregate results** — Posts pass/fail badge as PR comment.
+
+Always ensure `dotnet build` and `dotnet test` pass before submitting changes.
+
+## Architecture Rules
+
+### ABP Layering (Current Wiring + Preferred Usage)
+
+Current solution references are broader than a strict textbook layer graph:
+
+```
+Web → Application + HttpApi + HttpApi.Client + EntityFrameworkCore
+HttpApi → Application.Contracts + Domain
+Application → Domain + Application.Contracts
+Domain → Domain.Shared
+EntityFrameworkCore → Domain
+```
+
+Preferred code-usage boundaries (guidance for new code):
+
+- Prefer keeping web/UI concerns out of Application and Domain.
+- Prefer keeping business rules in Domain entities/managers, not in controllers or pages.
+- Prefer controllers/endpoints to use Application.Contracts surfaces for use-case orchestration.
+- Avoid introducing new cross-layer dependencies unless there is a clear ABP/module-composition reason.
+- Do not call other application services within the same module; move shared logic to Domain services/helpers.
+
+### Entity & Domain Conventions
+
+- Entities use **rich domain model**: private/protected setters, behavior via methods.
+- Include `protected` parameterless constructor for EF Core.
+- Do **not** generate `Guid` keys inside constructors; accept `id` from `IGuidGenerator`.
+- Reference other aggregate roots **by Id only**, not navigation properties.
+- Domain services use `*Manager` suffix.
+- Throw `BusinessException` with namespaced error codes for rule violations.
+
+### Application Layer
+
+- Interface naming: `I*AppService` inheriting `IApplicationService`.
+- All methods `async`, end with `Async`.
+- Accept/return **DTOs only**, never entities. Define DTOs in `*.Application.Contracts`.
+- Make all public methods `virtual` for extensibility.
+- This project uses **AutoMapper** (not Mapperly). Mapping profiles are `*AutoMapperProfile.cs` inheriting `Profile`.
+- `ObjectMapper.Map<>()` is used for DTO mapping, not Mapperly partials.
+
+### EF Core
+
+- Entity configuration uses extension methods (`ConfigureMyProject()` on `ModelBuilder`), not inline in `OnModelCreating`.
+- Always call `b.ConfigureByConvention()` for every entity mapping.
+- Use `options.AddDefaultRepositories()` without `includeAllEntities: true`.
+- Repository implementations inherit `EfCoreRepository<TDbContext, TEntity, TKey>`.
+
+### Testing Conventions
+
+- Test class naming: `*Tests.cs`
+- Base class hierarchy: `AbpIntegratedTest<TModule>` → `GrantManagerTestBase<T>` → domain-specific bases.
+- Use `[Fact]` for single tests, `[Theory]` with `[InlineData]` for parameterized.
+- Assertions: `Shouldly` (`result.ShouldBe(expected)`, `result.ShouldNotBeNull()`).
+- Mocking: `NSubstitute` (`Substitute.For<IService>()`).
+- JSON test fixtures loaded from `AppDomain.CurrentDomain.BaseDirectory`.
+
+### Code Style
+
+- **Prettier** for JS/CSS: single quotes, 4-space tabs, no tabs.
+- **C#**: Latest language version, nullable enabled in most projects.
+- Localization: English strings in `*/Localization/*/en.json`. All user-facing text must use localization; no hardcoded English in code.
+- Permissions defined in `*PermissionDefinitionProvider` in Application.Contracts.
+
+### Branching
+
+- `dev` → `test` → `main` promotion flow.
+- Feature work: `feature/*`, bug fixes: `bugfix/*`, urgent fixes: `hotfix/*`.
+
+## Skills
+
+For detailed ABP patterns (DDD, application services, EF Core, testing, module architecture), refer to `.github/skills/` for domain-specific guidance.
+
+## Agents
+
+Use the ABP workflow agents in `.github/agents/` to accelerate planning, development, and testing.
+
+### When to Use Each Agent
+
+- `feature-planner`: Convert a feature request or bug into a layered ABP implementation plan.
+- `ddd-modeler`: Design or review aggregates, invariants, repositories, and domain managers.
+- `application-service-designer`: Define app service contracts, DTOs, authorization, and AutoMapper changes.
+- `efcore-migration-planner`: Plan host vs tenant EF Core model updates and migration steps safely.
+- `permissions-localization-auditor`: Audit diffs for permission coverage, localization keys, and hardcoded text.
+- `test-strategy`: Build risk-based unit/integration test plans for ABP features.
+- `test-triage`: Diagnose failing tests and propose minimal-risk fixes with verification steps.
+- `pr-readiness`: Run ABP-focused pre-PR quality checks (layering, mapping, tests, migration correctness).
+
+### Usage Guidance
+
+Provide these inputs when invoking an agent:
+
+1. Feature or bug context.
+2. Target module(s) and affected layers.
+3. Tenant scope (host, tenant, or both).
+4. Constraints (security, timeline, performance, backward compatibility).
+
+Use multiple agents in sequence for larger work:
+
+1. `feature-planner`
+2. `ddd-modeler` and/or `abp-application-service-designer`
+3. `efcore-migration-planner` (if schema changes exist)
+4. `test-strategy` or `abp-test-triage`
+5. `permissions-localization-auditor`
+6. `pr-readiness`
diff --git a/applications/Unity.GrantManager/.github/instructions/csharp.instructions.md b/applications/Unity.GrantManager/.github/instructions/csharp.instructions.md
new file mode 100644
index 0000000000..aa9978fb26
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/instructions/csharp.instructions.md
@@ -0,0 +1,120 @@
+---
+applyTo: "**/*.cs"
+description: "C# and .NET 9 development standards for ABP Framework 9.1.3"
+---
+
+# C# Conventions for Unity Grant Manager
+
+- Target framework: .NET 9.0 with `<LangVersion>latest</LangVersion>`.
+- Nullable reference types are enabled in most projects.
+- This is an ABP Framework project. Use ABP base classes, not raw ASP.NET Core.
+- This is NOT the Unity game engine. Do not suggest UnityEngine APIs.
+
+## ABP Base Classes
+
+- Application Services: Inherit `ApplicationService`, implement interface from Application.Contracts
+- Domain Services: Inherit `DomainService`, use `Manager` suffix
+- Entities: Inherit `FullAuditedAggregateRoot<TKey>` or `AuditedAggregateRoot<TKey>`
+- API Controllers: Inherit `AbpController`
+- Repositories: Use `IRepository<TEntity, TKey>` by default; custom only when needed
+
+### Injected Properties Available in Base Classes
+
+These properties are pre-injected in `ApplicationService`, `DomainService`, and `AbpController`:
+
+| Property | Purpose |
+|---|---|
+| `GuidGenerator` | Create new entity IDs — never use `Guid.NewGuid()` |
+| `Clock` | Use `Clock.Now` — never use `DateTime.Now` or `DateTime.UtcNow` |
+| `CurrentUser` | Access authenticated user (Id, Name, Email, Roles) |
+| `CurrentTenant` | Access current tenant context (Id, Name) |
+| `L` / `L["Key"]` | Localization shortcut |
+| `ObjectMapper` | AutoMapper-based mapping |
+| `Logger` | Structured logging via `ILogger<T>` |
+| `AuthorizationService` | Programmatic authorization checks |
+| `UnitOfWorkManager` | Manual unit-of-work control |
+
+## Dependency Injection
+
+- ABP auto-registers services using marker interfaces — do NOT manually call `services.AddScoped<>()`
+- `ITransientDependency` — new instance per injection
+- `ISingletonDependency` — single shared instance
+- `IScopedDependency` — one per request
+- Application services, domain services, and repositories are auto-registered by ABP
+
+## Entities & Domain
+
+- Entities use rich domain model: private/protected setters, behaviour via methods.
+- Include `protected` parameterless constructor for EF Core deserialization.
+- Do not generate `Guid` keys inside constructors; accept `id` from `IGuidGenerator`.
+- Reference other aggregate roots by Id only, not navigation properties.
+- Domain services use `*Manager` suffix.
+- Throw `BusinessException` with namespaced error codes for rule violations.
+
+## Application Services
+
+- Interface naming: `I*AppService` inheriting `IApplicationService`.
+- All methods `async`, name ends with `Async`.
+- Accept/return DTOs only, never entities. Define DTOs in `*.Application.Contracts`.
+- Make all public methods `virtual`.
+- Use **AutoMapper** (`ObjectMapper.Map<>()`) for DTO mapping. Do NOT use Mapperly.
+- Mapping profiles: `*AutoMapperProfile.cs` inheriting `Profile`.
+
+## Code Style
+
+- 4 spaces indentation, no tabs
+- No emojis in comments
+- Always use braces, even for single-line statements
+- Use `nameof` instead of string literals when referring to member names
+- Prefer pattern matching and switch expressions where appropriate
+- All user-facing text must be localized via `L["Key"]`. No hardcoded English strings.
+- Permissions defined in `*PermissionDefinitionProvider` in Application.Contracts.
+- Do not call other application services within the same module; push shared logic to domain services.
+
+## Naming Conventions
+
+- Follow PascalCase for public members, types, and methods
+- Use camelCase for private fields and local variables
+- Prefix interface names with `I`
+- Domain Services: `*Manager` suffix (e.g., `AssessmentManager`)
+- Application Services: `*AppService` suffix (e.g., `ApplicationAppService`)
+- DTOs: Descriptive suffixes (`CreateApplicationDto`, `UpdateApplicationDto`, `ApplicationDto`)
+- Event Transfer Objects: `*Eto` suffix for distributed events
+
+
+## DTOs vs Entities
+
+- Application services MUST accept and return DTOs only, never entities
+- Use `ObjectMapper` (AutoMapper) to map between entities and DTOs
+- Define mapping profiles in `*AutoMapperProfile` class in Application project
+
+## Authorization
+
+- Apply `[Authorize(PermissionName)]` attributes on application service methods
+- Define permissions in `*Permissions` static class in Domain.Shared project
+
+## Multi-Tenancy
+
+- Tenant entities MUST implement `IMultiTenant` interface
+- NEVER manually filter by `TenantId` — ABP handles this automatically
+- Use `GrantTenantDbContext` for tenant data, `GrantManagerDbContext` for host data
+
+## Error Handling
+
+- Use `BusinessException` for domain-level errors with namespaced error codes (e.g., `"GrantManager:ApplicationNotFound"`)
+- Map error codes to localization keys for user-friendly messages
+- Use `.WithData("key", value)` for localized message interpolation
+- Catch specific exception types, not generic `Exception`
+
+## Common Mistakes to Avoid
+
+- Don't expose entities from application services — always return DTOs
+- Don't put business logic in application services — use domain services
+- Don't create custom repositories unnecessarily — use generic `IRepository<T, TKey>` first
+- Don't mix host and tenant data in same DbContext
+- Don't ignore nullable warnings — fix them properly
+- Don't use `DateTime.Now` — use `Clock.Now` or inject `IClock`
+- Don't use `Guid.NewGuid()` — use `GuidGenerator.Create()`
+- Don't use `services.AddScoped<>()` for ABP services — use marker interfaces
+- Don't call application services from within the same module — extract shared logic to a domain service
+- Don't embed entity name in app service methods — use `GetAsync`, not `GetApplicationAsync`
diff --git a/applications/Unity.GrantManager/.github/instructions/efcore.instructions.md b/applications/Unity.GrantManager/.github/instructions/efcore.instructions.md
new file mode 100644
index 0000000000..d308722720
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/instructions/efcore.instructions.md
@@ -0,0 +1,25 @@
+---
+applyTo: "**/EntityFrameworkCore/**/*.cs"
+---
+
+# EF Core Conventions for Unity Grant Manager
+
+- Provider: **Npgsql** (PostgreSQL 17).
+- Two database contexts: `GrantManagerDbContext` (host) and `GrantTenantDbContext` (tenant).
+- Entity configuration is done inline in `OnModelCreating` of `GrantManagerDbContext` and `GrantTenantDbContext`.
+- When configuring entities, follow ABP conventions (e.g., table naming, key configuration) consistently.
+- Use `options.AddDefaultRepositories(includeAllEntities: true)` in `GrantManagerEntityFrameworkCoreModule`.
+- Prefer ABP's generated default repositories; add custom repositories only when additional behavior is required.
+- Tests use **SQLite in-memory** databases, not PostgreSQL.
+
+## Migrations
+
+Always specify the context when adding migrations:
+
+```bash
+# Host migrations
+dotnet ef migrations add <Name> --context GrantManagerDbContext --output-dir Migrations/HostMigrations
+
+# Tenant migrations
+dotnet ef migrations add <Name> --context GrantTenantDbContext --output-dir Migrations/TenantMigrations
+```
diff --git a/applications/Unity.GrantManager/.github/instructions/javascript.instructions.md b/applications/Unity.GrantManager/.github/instructions/javascript.instructions.md
new file mode 100644
index 0000000000..075bffde01
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/instructions/javascript.instructions.md
@@ -0,0 +1,54 @@
+---
+applyTo: "**/*.js"
+description: "JavaScript development standards for ABP Framework frontend patterns"
+---
+
+# JavaScript Development Standards
+
+- Variables should be declared with "let" or "const" instead of "var"
+
+## General Patterns
+
+- Wrap all page scripts in IIFE: `(function ($) { ... })(jQuery);`
+- Never create global JavaScript variables
+- Use `var l = abp.localization.getResource('GrantManager');` for all user-facing text
+- Use ABP's dynamic JavaScript API client proxies instead of manual AJAX
+
+## ABP JavaScript Utilities
+
+- Notifications: `abp.notify.success()`, `.error()`, `.warn()`, `.info()`
+- Confirmation: `abp.message.confirm()` for destructive actions
+- Authorization: `abp.auth.isGranted()` for permission checks
+- Busy indicators: `abp.ui.setBusy()` / `abp.ui.clearBusy()`
+- Localization: `l('LocalizationKey')` — never hardcode user-facing strings
+
+## DataTables Integration
+
+- Use DataTables.net 2.x with Bootstrap 5 integration (`datatables.net-bs5`)
+- Always wrap configuration with `abp.libs.datatables.normalizeConfiguration()`
+- Use `abp.libs.datatables.createAjax()` for server-side pagination
+- Use `rowAction` for action buttons with `abp.auth.isGranted()` visibility checks
+- Use `dataFormat` property for automatic date/boolean formatting
+- Always call `dataTable.ajax.reload()` after CRUD operations
+
+## Modal Manager
+
+- Use `abp.ModalManager` for all modal dialogs
+- Configure with `viewUrl`, `scriptUrl`, and `modalClass`
+- Implement `onResult()` callback to reload DataTable after save
+- Modal script classes: register in `abp.modals.*` namespace
+- Return `NoContent()` from Razor Page handler to close modal
+
+## DOM Auto-Initialization
+
+- ABP auto-initializes: tooltips, popovers, datepickers, AJAX forms, autocomplete selects
+- Use `data-bs-toggle="tooltip"` for tooltips
+- Use `class="auto-complete-select"` with `data-autocomplete-*` attributes for lookups
+- Use `data-ajaxForm="true"` for AJAX form submission
+
+## Client-Side Package Management
+
+- Add NPM packages to `package.json`, prefer `@abp/*` packages
+- Configure `abp.resourcemapping.js` to map from `node_modules` to `wwwroot/libs`
+- Run `abp install-libs` to copy resources
+- Add to bundle contributor in `Unity.Theme.UX2` module
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/.github/instructions/security.instructions.md b/applications/Unity.GrantManager/.github/instructions/security.instructions.md
new file mode 100644
index 0000000000..bf95dea629
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/instructions/security.instructions.md
@@ -0,0 +1,48 @@
+---
+applyTo: "**/*.cs,**/*.cshtml,**/*.js"
+description: "Security best practices for Unity Grant Manager"
+---
+
+# Security Standards
+
+## Authorization
+
+- Apply `[Authorize(PermissionName)]` attributes on all application service methods
+- Define permissions in `*Permissions` static class in Domain.Shared project
+- Use `abp.auth.isGranted()` in JavaScript for UI permission checks
+- Never rely solely on UI-level permission hiding — always enforce server-side
+
+## Multi-Tenancy Security
+
+- Never manually filter by `TenantId` — ABP handles tenant isolation automatically
+- Ensure tenant-scoped entities implement `IMultiTenant`
+- Test cross-tenant data isolation explicitly
+- Use `GrantTenantDbContext` for tenant data, `GrantManagerDbContext` for host data
+- Be cautious with `[IgnoreMultiTenancy]` — understand the security implications
+
+## Input Validation
+
+- Validate all inputs at the application service boundary using data annotations or FluentValidation
+- Use ABP's `Check.*` methods for domain-level validation (e.g., `Check.NotNullOrWhiteSpace`)
+- Sanitize user inputs before storage — prevent XSS and injection attacks
+- Use parameterized queries — never concatenate user input into SQL
+
+## Secrets Management
+
+- Never commit secrets, connection strings, or API keys to source code
+- Use environment variables or secure configuration providers
+- Reference `.env.example` for required environment variables
+- Sensitive configuration is stored in OpenShift secrects and Hashicorp Vault when deployed
+
+## Authentication
+
+- Authentication is handled via Keycloak (OpenID Connect)
+- Do not implement custom authentication — use ABP's identity infrastructure
+- Ensure all API endpoints require authentication unless explicitly public
+
+## Data Protection
+
+- Use Redis-backed data protection for key storage in distributed deployments
+- Encrypt sensitive data at rest when required by compliance
+- Follow government security standards (BC Government policies)
+- Audit logging is enabled via ABP — ensure sensitive operations are captured
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/.github/instructions/testing.instructions.md b/applications/Unity.GrantManager/.github/instructions/testing.instructions.md
new file mode 100644
index 0000000000..5117256fcd
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/instructions/testing.instructions.md
@@ -0,0 +1,30 @@
+---
+applyTo: "**/test/**/*.cs"
+---
+
+# Testing Conventions for Unity Grant Manager
+
+- Framework: **xUnit 2.9.3** with **Shouldly 4.3.0** assertions and **NSubstitute 5.3.0** mocks.
+- Tests use in-memory database providers (SQLite in-memory for most test projects; `Unity.GrantManager.Web.Tests` uses `Microsoft.EntityFrameworkCore.InMemory`). No external PostgreSQL/database setup is required.
+- Test class naming: `*Tests.cs`.
+- Base class hierarchy: `AbpIntegratedTest<TModule>` → `GrantManagerTestBase<T>` → domain-specific bases.
+- Use `[Fact]` for single tests, `[Theory]` with `[InlineData]` for parameterized.
+- Assertions: Shouldly (`result.ShouldBe(expected)`, `result.ShouldNotBeNull()`). Do NOT use `Assert.*`.
+- Mocking: NSubstitute (`Substitute.For<IService>()`). Do NOT use Moq.
+- JSON test fixtures loaded from `AppDomain.CurrentDomain.BaseDirectory`.
+- Run all tests: `dotnet test Unity.GrantManager.sln --no-build`
+- Test method naming: `Should_[Expected]_[Scenario]`
+- Follow Arrange-Act-Assert pattern consistently
+- Do not emit "Arrange", "Act", or "Assert" comments in generated tests
+
+## Multi-Tenancy Testing
+
+- Test tenant data isolation using `CurrentTenant.Change(tenantId)`
+- Verify that data created in one tenant is not visible in another
+- Test both host-level and tenant-level operations
+
+## Test Data Management
+
+- Use helper methods for test data creation (e.g., `CreateTestApplicationAsync()`)
+- Use static test data constants for well-known IDs
+- Keep test data self-contained — each test should set up its own state
diff --git a/applications/Unity.GrantManager/.github/skills/abp-cli/SKILL.md b/applications/Unity.GrantManager/.github/skills/abp-cli/SKILL.md
new file mode 100644
index 0000000000..df1fd7b055
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/skills/abp-cli/SKILL.md
@@ -0,0 +1,78 @@
+---
+name: abp-cli
+description: ABP CLI commands - generate-proxy, install-libs, add-package-ref, new-module, install-module, abp update, abp clean, abp suite generate. Use when the user asks how to run ABP CLI commands, generate proxies, install libraries, or use ABP Suite.
+---
+
+# ABP CLI Commands
+
+> **Full documentation**: https://abp.io/docs/latest/cli
+> Use `abp help [command]` for detailed options.
+
+## Generate Client Proxies
+
+```bash
+# URL flag: `-u` (short) or `--url` (long). Use whichever your team prefers, but keep it consistent.
+#
+# Angular (host must be running)
+abp generate-proxy -t ng
+
+# C# client proxies
+abp generate-proxy -t csharp -u https://localhost:44300
+
+# Integration services only (microservices)
+abp generate-proxy -t csharp -u https://localhost:44300 -st integration
+
+# JavaScript
+abp generate-proxy -t js -u https://localhost:44300
+```
+
+## Install Client-Side Libraries
+
+```bash
+# Install NPM packages for MVC/Blazor Server
+abp install-libs
+```
+
+## Add Package Reference
+
+```bash
+# Add project reference with module dependency
+abp add-package-ref Acme.BookStore.Domain
+abp add-package-ref Acme.BookStore.Domain -t Acme.BookStore.Application
+```
+
+## Module Operations
+
+```bash
+# Create new module in solution
+abp new-module Acme.OrderManagement -t module:ddd
+
+# Install published module
+abp install-module Volo.Blogging
+
+# Add ABP NuGet package
+abp add-package Volo.Abp.Caching.StackExchangeRedis
+```
+
+## Update & Clean
+
+```bash
+abp update                  # Update all ABP packages
+abp update --version 8.0.0  # Specific version
+abp clean                   # Delete bin/obj folders
+```
+
+## Quick Reference
+
+| Task | Command |
+|------|---------|
+| Angular proxies | `abp generate-proxy -t ng` |
+| C# proxies | `abp generate-proxy -t csharp -u URL` |
+| Install JS libs | `abp install-libs` |
+| Add reference | `abp add-package-ref PackageName` |
+| Create module | `abp new-module ModuleName` |
+| Install module | `abp install-module ModuleName` |
+| Update packages | `abp update` |
+| Clean solution | `abp clean` |
+| Suite CRUD | `abp suite generate -e entity.json -s solution.sln` |
+| Get help | `abp help [command]` |
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/.github/skills/unity-application-layer/SKILL.md b/applications/Unity.GrantManager/.github/skills/unity-application-layer/SKILL.md
new file mode 100644
index 0000000000..f68910980b
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/skills/unity-application-layer/SKILL.md
@@ -0,0 +1,91 @@
+---
+name: unity-application-layer
+description: ABP Application Services, DTOs, AutoMapper profiles, validation, and error handling for Unity. Use when creating or modifying app services, DTOs, or mapping profiles in Application or Application.Contracts projects.
+---
+
+# Unity Application Layer Patterns
+
+## Application Service Contracts (Application.Contracts)
+
+- Interface naming: `I*AppService` inheriting `IApplicationService`.
+- Define DTOs in `*.Application.Contracts` — never in Domain or Web.
+- All methods async, end with `Async`.
+- Do NOT repeat entity name in method names: use `GetAsync`, not `GetGrantAsync`.
+
+```csharp
+public interface IGrantAppService : IApplicationService
+{
+    Task<GrantDto> GetAsync(Guid id);
+    Task<PagedResultDto<GrantDto>> GetListAsync(GetGrantListInput input);
+    Task<GrantDto> CreateAsync(CreateGrantDto input);
+    Task<GrantDto> UpdateAsync(Guid id, UpdateGrantDto input); // ID separate from DTO
+    Task DeleteAsync(Guid id);
+}
+```
+
+## DTO Conventions
+
+| Purpose | Convention | Example |
+|---------|------------|---------|
+| Query input | `Get{Entity}Input` | `GetGrantInput` |
+| List query | `Get{Entity}ListInput` | `GetGrantListInput` |
+| Create input | `Create{Entity}Dto` | `CreateGrantDto` |
+| Update input | `Update{Entity}Dto` | `UpdateGrantDto` |
+| Output | `{Entity}Dto` | `GrantDto` |
+
+- Use data annotations for validation; reuse constants from Domain.Shared.
+- Do NOT share input DTOs between methods.
+- Do NOT put logic in DTOs (except `IValidatableObject` when necessary).
+
+## Implementation (Application)
+
+- Inherit from `ApplicationService`.
+- Make all public methods `virtual`.
+- Prefer `protected virtual` over `private` for helper methods.
+- Use dedicated repositories, not inline LINQ in app services.
+- Call `repository.UpdateAsync()` explicitly after mutations (don't assume change tracking).
+- Do NOT use web types (`IFormFile`, `Stream`) — accept `byte[]` from controllers.
+- Do NOT call other app services in the same module. Use domain services or repositories.
+
+## Object Mapping (AutoMapper)
+
+This project uses **AutoMapper** (not Mapperly). Mapping profiles are defined as:
+
+```csharp
+public class GrantManagerApplicationAutoMapperProfile : Profile
+{
+    public GrantManagerApplicationAutoMapperProfile()
+    {
+        CreateMap<Grant, GrantDto>();
+        CreateMap<CreateGrantDto, Grant>();
+    }
+}
+```
+
+- Profile files follow `*AutoMapperProfile.cs` naming.
+- Each Application and Web project has its own profile.
+- Use `ObjectMapper.Map<TSource, TDest>(source)` in app services.
+
+## Error Handling
+
+```csharp
+// Business rule violation — use namespaced error code
+throw new BusinessException("GrantManager:DuplicateName")
+    .WithData("Name", name);
+
+// Entity not found
+throw new EntityNotFoundException(typeof(Grant), id);
+
+// User-facing message (use localized string)
+throw new UserFriendlyException(L["GrantNotAvailable"]);
+```
+
+## Authorization
+
+- Use `[Authorize(PermissionName)]` on service methods.
+- Permission names defined as constants in `*Permissions` classes in Application.Contracts.
+
+## Cross-Module Calls
+
+- You MAY call other modules' app services via their Application.Contracts interfaces.
+- Do NOT call app services within the same module — use domain services.
diff --git a/applications/Unity.GrantManager/.github/skills/unity-domain-driven-design/SKILL.md b/applications/Unity.GrantManager/.github/skills/unity-domain-driven-design/SKILL.md
new file mode 100644
index 0000000000..0f309f4998
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/skills/unity-domain-driven-design/SKILL.md
@@ -0,0 +1,105 @@
+---
+name: unity-domain-driven-design
+description: DDD patterns for Unity - Entities, Aggregate Roots, Repositories, Domain Services, Domain Events. Use when creating or modifying entities, repositories, or domain services in Domain or Domain.Shared projects.
+---
+
+# Unity ABP DDD Patterns
+
+> Based on ABP Framework DDD conventions. This project uses ABP 9.1.3 with PostgreSQL 17 and EF Core 9.0.
+
+## Entities
+
+- Define entities in `*.Domain` projects.
+- Use **rich domain model**: private/protected setters with methods that enforce invariants.
+- Always provide a `protected` parameterless constructor for EF Core.
+- Accept `Guid id` in the primary constructor; do NOT generate GUIDs inside constructors. Use `IGuidGenerator` from calling code.
+- Make members `virtual` for ORM proxy compatibility.
+- Initialize sub-collections in the primary constructor.
+
+```csharp
+public class Grant : AuditedAggregateRoot<Guid>
+{
+    public string Name { get; private set; }
+    public GrantStatus Status { get; private set; }
+    public ICollection<GrantApplication> Applications { get; private set; }
+
+    protected Grant() { } // For EF Core
+
+    public Grant(Guid id, string name) : base(id)
+    {
+        Name = Check.NotNullOrWhiteSpace(name, nameof(name));
+        Status = GrantStatus.Draft;
+        Applications = new List<GrantApplication>();
+    }
+
+    public void SetName(string name)
+    {
+        Name = Check.NotNullOrWhiteSpace(name, nameof(name));
+    }
+}
+```
+
+## Aggregate Roots
+
+- Use a single `Id` property, prefer `Guid` keys.
+- Inherit from `AggregateRoot<Guid>` or audited base classes (`AuditedAggregateRoot<Guid>`, `FullAuditedAggregateRoot<Guid>`).
+- Reference other aggregate roots **by Id only** — no cross-aggregate navigation properties.
+- Keep aggregates small.
+
+## Repositories
+
+- Define repository interfaces in the Domain layer.
+- One repository per aggregate root only. Never create repositories for child entities.
+- Custom repository interface should inherit `IRepository<TEntity, TKey>`.
+- All methods async with `CancellationToken cancellationToken = default`.
+- Single-entity methods: `includeDetails = true` by default.
+- List methods: `includeDetails = false` by default.
+
+```csharp
+public interface IGrantRepository : IRepository<Grant, Guid>
+{
+    Task<Grant?> FindByNameAsync(string name, bool includeDetails = true, CancellationToken cancellationToken = default);
+    Task<List<Grant>> GetListByStatusAsync(GrantStatus status, bool includeDetails = false, CancellationToken cancellationToken = default);
+}
+```
+
+## Domain Services
+
+- Naming: `*Manager` suffix (e.g., `GrantManager`).
+- No interface by default unless multiple implementations are needed.
+- Accept/return domain objects, not DTOs.
+- Do NOT depend on authenticated user; accept required values from application layer.
+- Use `GuidGenerator`, `Clock` from base class properties.
+
+```csharp
+public class GrantManager : DomainService
+{
+    private readonly IGrantRepository _grantRepository;
+
+    public GrantManager(IGrantRepository grantRepository)
+    {
+        _grantRepository = grantRepository;
+    }
+
+    public async Task<Grant> CreateAsync(string name)
+    {
+        var existing = await _grantRepository.FindByNameAsync(name);
+        if (existing != null)
+            throw new BusinessException("GrantManager:NameAlreadyExists").WithData("Name", name);
+
+        return new Grant(GuidGenerator.Create(), name);
+    }
+}
+```
+
+## Domain Events
+
+- `AddLocalEvent()` — same transaction, can access full entity state.
+- `AddDistributedEvent()` — async, use ETOs defined in Domain.Shared.
+- This project uses **RabbitMQ** for distributed events via `IDistributedEventBus`.
+
+## Shared Constants
+
+- Define constants, enums, and error codes in `*.Domain.Shared`.
+- Localization resources (JSON) live under `Domain.Shared/Localization/*/en.json`.
+- Error codes: namespaced as `ModuleName:ErrorCode`.
diff --git a/applications/Unity.GrantManager/.github/skills/unity-ef-core/SKILL.md b/applications/Unity.GrantManager/.github/skills/unity-ef-core/SKILL.md
new file mode 100644
index 0000000000..7743d295b9
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/skills/unity-ef-core/SKILL.md
@@ -0,0 +1,112 @@
+---
+name: unity-ef-core
+description: ABP Entity Framework Core for Unity - DbContext configuration, entity mapping, repository implementation, EF migrations. Use when working in EntityFrameworkCore projects, adding migrations, or implementing repositories.
+---
+
+# Unity EF Core Patterns
+
+> This project uses EF Core 9.0 with PostgreSQL 17 (Npgsql). Tests use SQLite in-memory.
+
+## Database Contexts
+
+This project has **two distinct database contexts**:
+
+| Context | Purpose | Migrations Directory |
+|---------|---------|---------------------|
+| `GrantManagerDbContext` | Host/shared system tables | `Migrations/HostMigrations` |
+| `GrantTenantDbContext` | Per-tenant isolated data | `Migrations/TenantMigrations` |
+
+Always specify the context when adding migrations:
+
+```bash
+cd src/Unity.GrantManager.EntityFrameworkCore
+
+# Host migration
+dotnet ef migrations add <Name> --context GrantManagerDbContext --output-dir Migrations/HostMigrations
+
+# Tenant migration
+dotnet ef migrations add <Name> --context GrantTenantDbContext --output-dir Migrations/TenantMigrations
+```
+
+## Entity Configuration
+
+Entity mapping is done via extension methods on `ModelBuilder`, NOT inline in `OnModelCreating`.
+
+```csharp
+public static class GrantManagerDbContextModelCreatingExtensions
+{
+    public static void ConfigureGrantManager(this ModelBuilder builder)
+    {
+        Check.NotNull(builder, nameof(builder));
+
+        builder.Entity<Grant>(b =>
+        {
+            b.ToTable(GrantManagerConsts.DbTablePrefix + "Grants", GrantManagerConsts.DbSchema);
+            b.ConfigureByConvention(); // Always call this first
+
+            b.Property(x => x.Name)
+                .IsRequired()
+                .HasMaxLength(GrantConsts.MaxNameLength);
+
+            b.HasIndex(x => x.Name);
+        });
+    }
+}
+```
+
+**Rules:**
+- Always call `b.ConfigureByConvention()` for every entity.
+- Use table prefix from constants (not hardcoded).
+- Default schema should be `null`.
+
+## Repository Implementation
+
+```csharp
+public class GrantRepository : EfCoreRepository<GrantManagerDbContext, Grant, Guid>, IGrantRepository
+{
+    public GrantRepository(IDbContextProvider<GrantManagerDbContext> dbContextProvider)
+        : base(dbContextProvider) { }
+
+    public async Task<Grant?> FindByNameAsync(
+        string name,
+        bool includeDetails = true,
+        CancellationToken cancellationToken = default)
+    {
+        var dbSet = await GetDbSetAsync();
+        return await dbSet
+            .IncludeDetails(includeDetails)
+            .FirstOrDefaultAsync(g => g.Name == name, GetCancellationToken(cancellationToken));
+    }
+}
+```
+
+- Use DbContext interface as generic parameter.
+- Pass cancellation tokens via `GetCancellationToken(cancellationToken)`.
+- Use `IncludeDetails()` extensions per aggregate root.
+
+## Module Registration
+
+```csharp
+context.Services.AddAbpDbContext<GrantManagerDbContext>(options =>
+{
+    options.AddDefaultRepositories(); // Aggregate roots only, NOT includeAllEntities: true
+});
+
+Configure<AbpDbContextOptions>(options =>
+{
+    options.UseNpgsql(); // PostgreSQL
+});
+```
+
+## Never Do
+
+| Don't | Do Instead |
+|-------|-----------|
+| `AddDefaultRepositories(includeAllEntities: true)` | `AddDefaultRepositories()` — aggregate roots only |
+| Skip `ConfigureByConvention()` | Always call it first in entity config |
+| Inject DbContext in app/domain services | Use `IRepository<T>` or custom repository interface |
+| Use lazy loading | Explicit `.Include()` via `IncludeDetails()` |
+
+## Migrations .editorconfig
+
+The `Migrations/` folder has its own `.editorconfig` suppressing analyzer warnings (S1128, S1192, CS8981, CA1861, IDE naming rules). This is intentional — do not modify migration files for style.
diff --git a/applications/Unity.GrantManager/.github/skills/unity-module-structure/SKILL.md b/applications/Unity.GrantManager/.github/skills/unity-module-structure/SKILL.md
new file mode 100644
index 0000000000..68ed0f8091
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/skills/unity-module-structure/SKILL.md
@@ -0,0 +1,113 @@
+---
+name: unity-module-structure
+description: ABP module architecture and layering rules for Unity. Use when creating new modules, adding cross-module dependencies, or understanding project organization and dependency direction.
+---
+
+# Unity Module Architecture
+
+## Module Layout
+
+Each ABP module follows a standard layered structure under `modules/`:
+
+```
+Unity.{ModuleName}/
+  src/
+    Unity.{ModuleName}.Domain.Shared/     ← Enums, constants, localization, ETOs
+    Unity.{ModuleName}.Domain/            ← Entities, repository interfaces, domain services
+    Unity.{ModuleName}.Application.Contracts/ ← DTOs, app service interfaces
+    Unity.{ModuleName}.Application/       ← App service implementations, AutoMapper profiles
+    Unity.{ModuleName}.EntityFrameworkCore/ ← DbContext, migrations (if module has own DB tables)
+    Unity.{ModuleName}.HttpApi/           ← REST controllers
+    Unity.{ModuleName}.HttpApi.Client/    ← Remote client proxies
+    Unity.{ModuleName}.Web/               ← Razor Pages, view components
+  test/
+    Unity.{ModuleName}.TestBase/
+    Unity.{ModuleName}.Application.Tests/
+    Unity.{ModuleName}.Domain.Tests/
+    Unity.{ModuleName}.EntityFrameworkCore.Tests/
+```
+
+Not all modules have every layer. Simpler modules may only have `Application`, `Application.Contracts`, `Shared`, and `Web`.
+
+## Current Modules
+
+| Module | Layers Present | Purpose |
+|--------|---------------|---------|
+| **Unity.Flex** | Shared, App.Contracts, App, Web, Tests | Dynamic forms/worksheets |
+| **Unity.Notifications** | Full stack (Domain→Web, HttpApi, EF) | Email/messaging |
+| **Unity.Payments** | Shared, App.Contracts, App, Web, Tests | Financial transactions |
+| **Unity.Reporting** | Shared, App.Contracts, App, Web, Tests | Analytics & reports |
+| **Unity.AI** | Shared, App.Contracts, App, Web | AI analysis (OpenAI) |
+| **Unity.TenantManagement** | App.Contracts, App, HttpApi, Web, Tests | Multi-tenant admin |
+| **Unity.Identity.Web** | Web, Tests | OIDC authentication UI |
+| **Unity.Theme.UX2** | Theme package, Tests | Custom Razor Pages theme |
+| **Unity.SharedKernel** | Single project | Cross-cutting utilities |
+
+## Dependency Direction (Strict)
+
+```
+Web → HttpApi → Application.Contracts
+Application → Domain + Application.Contracts
+Domain → Domain.Shared
+EntityFrameworkCore → Domain only
+```
+
+### Rules
+
+- Web/HttpApi must NEVER depend on Application (only Application.Contracts).
+- Application must NEVER depend on Web or EF Core.
+- Domain must NEVER depend on Application, Web, or EF Core.
+- Domain.Shared must have NO dependencies on other layers.
+- EF Core must ONLY depend on Domain.
+
+## ABP Module Classes
+
+Every package has exactly one `AbpModule` class with `[DependsOn]` attributes.
+
+```csharp
+[DependsOn(
+    typeof(GrantManagerDomainModule),
+    typeof(AbpEntityFrameworkCoreModule)
+)]
+public class GrantManagerEntityFrameworkCoreModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        context.Services.AddAbpDbContext<GrantManagerDbContext>(options =>
+        {
+            options.AddDefaultRepositories();
+        });
+    }
+}
+```
+
+## Multi-Tenancy
+
+- The system uses ABP multi-tenancy with separate database per tenant.
+- `GrantManagerDbContext` = host context, `GrantTenantDbContext` = tenant context.
+- Tenant-scoped data is accessed via `ICurrentTenant` / tenant switching.
+- The `Unity.TenantManagement` module handles tenant administration.
+
+## Adding a New Feature
+
+1. Identify which module the feature belongs to.
+2. Add entities/repositories in Domain layer.
+3. Add DTOs/interfaces in Application.Contracts.
+4. Implement app services in Application.
+5. Add EF Core configuration if new tables are needed.
+6. Add UI in Web layer.
+7. Add tests in the module's test projects.
+8. Register the module class with `[DependsOn]`.
+9. Run `dotnet build Unity.GrantManager.sln` and `dotnet test Unity.GrantManager.sln` to verify.
+
+## Localization
+
+Each module with Domain.Shared has its own localization under:
+`src/Unity.{ModuleName}.Domain.Shared/Localization/{ModuleName}/en.json`
+
+Use `L["Key"]` in application services and pages. All user-facing text must be localized.
+
+## Permissions
+
+Define in `*PermissionDefinitionProvider` in Application.Contracts.
+Permission names follow `{ModuleName}.{Resource}.{Action}` convention.
diff --git a/applications/Unity.GrantManager/.github/skills/unity-testing/SKILL.md b/applications/Unity.GrantManager/.github/skills/unity-testing/SKILL.md
new file mode 100644
index 0000000000..eed37f3f5f
--- /dev/null
+++ b/applications/Unity.GrantManager/.github/skills/unity-testing/SKILL.md
@@ -0,0 +1,155 @@
+---
+name: unity-testing
+description: Testing patterns for Unity - xUnit, Shouldly assertions, NSubstitute mocks, ABP test infrastructure. Use when writing or modifying unit tests or integration tests.
+---
+
+# Unity Testing Patterns
+
+## Test Infrastructure
+
+| Aspect | Value |
+|--------|-------|
+| Framework | xUnit 2.9.3 |
+| Assertions | Shouldly 4.3.0 |
+| Mocking | NSubstitute 5.3.0 |
+| Database | In-memory (SQLite for most projects; EFCore.InMemory for Web tests – no PostgreSQL required) |
+| Base Classes | ABP `AbpIntegratedTest<TModule>` |
+| Target | .NET 9.0 |
+
+## Test Project Locations
+
+```
+test/
+  Unity.GrantManager.TestBase/          ← Shared fixtures & test data
+  Unity.GrantManager.Application.Tests/ ← App service tests
+  Unity.GrantManager.Domain.Tests/      ← Domain logic tests
+  Unity.GrantManager.EntityFrameworkCore.Tests/
+  Unity.GrantManager.Web.Tests/
+modules/Unity.*/test/                   ← Each module has its own test projects
+```
+
+## Running Tests
+
+```bash
+# All tests (~470 tests, ~2 min)
+dotnet test Unity.GrantManager.sln
+
+# Single project
+dotnet test test/Unity.GrantManager.Application.Tests/
+
+# After build (faster)
+dotnet test Unity.GrantManager.sln --no-build
+```
+
+## Base Class Hierarchy
+
+```
+AbpIntegratedTest<TStartupModule>           (Volo.Abp.Testing)
+└── GrantManagerTestBase<TStartupModule>    (shared UoW helpers)
+    ├── GrantManagerDomainTestBase           (domain tests)
+    ├── GrantManagerEntityFrameworkCoreTestBase
+    └── Module-specific bases:
+        ├── FlexTestBaseModule
+        ├── TenantManagementTestBase
+        └── ReportingTestBase
+```
+
+## Writing Tests
+
+### Unit Test Example (with mocking)
+
+```csharp
+public class MyServiceTests
+{
+    private readonly IMyRepository _repository;
+    private readonly MyService _sut;
+
+    public MyServiceTests()
+    {
+        _repository = Substitute.For<IMyRepository>();
+        _sut = new MyService(_repository);
+    }
+
+    [Fact]
+    public async Task CreateAsync_WithValidInput_ShouldSucceed()
+    {
+        // Arrange
+        _repository.FindByNameAsync(Arg.Any<string>()).Returns((MyEntity?)null);
+
+        // Act
+        var result = await _sut.CreateAsync("test");
+
+        // Assert
+        result.ShouldNotBeNull();
+        result.Name.ShouldBe("test");
+    }
+}
+```
+
+### Integration Test Example (ABP)
+
+```csharp
+public class GrantAppServiceTests : GrantManagerApplicationTestBase
+{
+    private readonly IGrantAppService _grantAppService;
+
+    public GrantAppServiceTests()
+    {
+        _grantAppService = GetRequiredService<IGrantAppService>();
+    }
+
+    [Fact]
+    public async Task Should_Get_Grant_By_Id()
+    {
+        var result = await _grantAppService.GetAsync(GrantManagerTestData.GrantId);
+        result.ShouldNotBeNull();
+        result.Id.ShouldBe(GrantManagerTestData.GrantId);
+    }
+}
+```
+
+### Parameterized Tests
+
+```csharp
+[Theory]
+[InlineData("schema1.json", 128)]
+[InlineData("schema2.json", 10)]
+public void TestMapping(string filename, int expectedCount)
+{
+    var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "TestData", filename);
+    var json = File.ReadAllText(path);
+    var result = Parse(json);
+    result.Count.ShouldBe(expectedCount);
+}
+```
+
+## Test Data
+
+- JSON fixtures are loaded from `AppDomain.CurrentDomain.BaseDirectory` subdirectories.
+- Domain tests include JSON files in `Intake/Files/*.json` and `Intake/Mapping/*.json` (copied to output via `.csproj`).
+- Shared test data constants live in `*TestData.cs` classes within TestBase projects.
+
+## Web Tests
+
+Web tests use `[Collection]` fixture pattern:
+
+```csharp
+[Collection(WebTestCollection.Name)]
+public class MyWidgetTests
+{
+    private readonly IAbpLazyServiceProvider _lazyServiceProvider;
+
+    public MyWidgetTests(WebTestFixture fixture)
+    {
+        _lazyServiceProvider = fixture.Services.GetRequiredService<IAbpLazyServiceProvider>();
+    }
+}
+```
+
+## Conventions
+
+- Test class naming: `*Tests.cs`
+- Method naming: `Should_ExpectedBehavior_When_Condition` or `MethodName_Scenario_ExpectedResult`
+- Always use `Shouldly` for assertions (not `Assert.Equal`)
+- Always use `NSubstitute` for mocking (not Moq)
+- Test runner config: `xunit.runner.json` with `"shadowCopy": false`
diff --git a/applications/Unity.GrantManager/.vscode/settings.json b/applications/Unity.GrantManager/.vscode/settings.json
new file mode 100644
index 0000000000..ccc17ff07a
--- /dev/null
+++ b/applications/Unity.GrantManager/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "github.copilot.chat.commitMessageGeneration.instructions": [
+        {
+            "file": ".github/commit-message-instructions.md"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/Unity.GrantManager.sln b/applications/Unity.GrantManager/Unity.GrantManager.sln
index 567d2f71c0..9fa0d5294b 100644
--- a/applications/Unity.GrantManager/Unity.GrantManager.sln
+++ b/applications/Unity.GrantManager/Unity.GrantManager.sln
@@ -153,7 +153,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Payments.Shared", "mo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Flex.Web.Tests", "modules\Unity.Flex\test\Unity.Flex.Web.Tests\Unity.Flex.Web.Tests.csproj", "{5F4CFB7E-A14A-40A1-8833-A55CB296D31B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Reporting.Web", "modules\Unity.Reporting\src\Unity.Reporting.Web\Unity.Reporting.Web.csproj", "{3E4E5506-9820-4650-8062-4A07FB2C851A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Reporting.Web", "modules\Unity.Reporting\src\Unity.Reporting.Web\Unity.Reporting.Web.csproj", "{3E4E5506-9820-4650-8062-4A07FB2C851A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unity.AI", "Unity.AI", "{BA2040C4-DC9D-44D2-B8A8-5A18D3D649AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.AI.Shared", "modules\Unity.AI\src\Unity.AI.Domain.Shared\Unity.AI.Shared.csproj", "{7C0E6C61-0903-4D48-B9ED-FFE08C4D420A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.AI.Application.Contracts", "modules\Unity.AI\src\Unity.AI.Application.Contracts\Unity.AI.Application.Contracts.csproj", "{3ACF64C1-492A-4BE6-B270-0F755C65F30B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.AI.Application", "modules\Unity.AI\src\Unity.AI.Application\Unity.AI.Application.csproj", "{7CF9D364-2018-4199-879B-371F6E1AC58B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.AI.Web", "modules\Unity.AI\src\Unity.AI.Web\Unity.AI.Web.csproj", "{378A4EB8-3DC1-420E-98B5-798DE71BEF0D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -397,6 +407,22 @@ Global
 		{3E4E5506-9820-4650-8062-4A07FB2C851A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E4E5506-9820-4650-8062-4A07FB2C851A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E4E5506-9820-4650-8062-4A07FB2C851A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C0E6C61-0903-4D48-B9ED-FFE08C4D420A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C0E6C61-0903-4D48-B9ED-FFE08C4D420A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C0E6C61-0903-4D48-B9ED-FFE08C4D420A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C0E6C61-0903-4D48-B9ED-FFE08C4D420A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3ACF64C1-492A-4BE6-B270-0F755C65F30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ACF64C1-492A-4BE6-B270-0F755C65F30B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ACF64C1-492A-4BE6-B270-0F755C65F30B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3ACF64C1-492A-4BE6-B270-0F755C65F30B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CF9D364-2018-4199-879B-371F6E1AC58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CF9D364-2018-4199-879B-371F6E1AC58B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CF9D364-2018-4199-879B-371F6E1AC58B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CF9D364-2018-4199-879B-371F6E1AC58B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{378A4EB8-3DC1-420E-98B5-798DE71BEF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{378A4EB8-3DC1-420E-98B5-798DE71BEF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{378A4EB8-3DC1-420E-98B5-798DE71BEF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{378A4EB8-3DC1-420E-98B5-798DE71BEF0D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -475,6 +501,11 @@ Global
 		{0355D299-4880-4F11-84A9-E14639A76AC4} = {DC64FA90-4E98-442F-BBA9-116940A928CF}
 		{5F4CFB7E-A14A-40A1-8833-A55CB296D31B} = {CDE485CC-D6EA-457A-88D6-DEEAF7CAC424}
 		{3E4E5506-9820-4650-8062-4A07FB2C851A} = {FF8024E0-68D2-4716-8812-E6D16730F4CC}
+		{BA2040C4-DC9D-44D2-B8A8-5A18D3D649AB} = {00099710-CF66-4BD2-932C-5B7534B78185}
+		{7C0E6C61-0903-4D48-B9ED-FFE08C4D420A} = {BA2040C4-DC9D-44D2-B8A8-5A18D3D649AB}
+		{3ACF64C1-492A-4BE6-B270-0F755C65F30B} = {BA2040C4-DC9D-44D2-B8A8-5A18D3D649AB}
+		{7CF9D364-2018-4199-879B-371F6E1AC58B} = {BA2040C4-DC9D-44D2-B8A8-5A18D3D649AB}
+		{378A4EB8-3DC1-420E-98B5-798DE71BEF0D} = {BA2040C4-DC9D-44D2-B8A8-5A18D3D649AB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/.gitattributes b/applications/Unity.GrantManager/modules/Unity.AI/.gitattributes
new file mode 100644
index 0000000000..c941e52669
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/.gitattributes
@@ -0,0 +1 @@
+**/wwwroot/libs/** linguist-vendored
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/.gitignore b/applications/Unity.GrantManager/modules/Unity.AI/.gitignore
new file mode 100644
index 0000000000..e278eb5d95
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/.gitignore
@@ -0,0 +1,262 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# Reporting
+host/Unity.Reporting.AuthServer/Logs/logs.txt
+host/Unity.Reporting.HttpApi.Host/Logs/logs.txt
+host/Unity.Reporting.Web.Host/Logs/logs.txt
+host/Unity.Reporting.Web.Unified/Logs/logs.txt
+host/Unity.Reporting.Blazor.Server.Host/Logs/logs.txt
+
+# Use abp install-libs to restore.
+**/wwwroot/libs/*
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/.prettierrc b/applications/Unity.GrantManager/modules/Unity.AI/.prettierrc
new file mode 100644
index 0000000000..56af76bd94
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/.prettierrc
@@ -0,0 +1,5 @@
+{
+    "singleQuote": true,
+    "useTabs": false,
+    "tabWidth": 4
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/NuGet.Config b/applications/Unity.GrantManager/modules/Unity.AI/NuGet.Config
new file mode 100644
index 0000000000..bdc451971a
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/NuGet.Config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/common.props b/applications/Unity.GrantManager/modules/Unity.AI/common.props
new file mode 100644
index 0000000000..87cf88dc65
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/common.props
@@ -0,0 +1,24 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <Version>0.1.0</Version>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <AbpProjectType>module</AbpProjectType>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.5.3">
+      <PrivateAssets>All</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+
+  <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
+    <PropertyGroup>
+      <NoWarn>$(NoWarn);0436</NoWarn>
+    </PropertyGroup>
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AIApplicationContractsModule.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AIApplicationContractsModule.cs
new file mode 100644
index 0000000000..f9e53089f8
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AIApplicationContractsModule.cs
@@ -0,0 +1,15 @@
+using Volo.Abp.Application;
+using Volo.Abp.Modularity;
+using Volo.Abp.Authorization;
+
+namespace Unity.AI;
+
+[DependsOn(
+    typeof(AIDomainSharedModule),
+    typeof(AbpDddApplicationContractsModule),
+    typeof(AbpAuthorizationModule)
+    )]
+public class AIApplicationContractsModule : AbpModule
+{
+
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AIRemoteServiceConsts.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AIRemoteServiceConsts.cs
new file mode 100644
index 0000000000..118f068b39
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AIRemoteServiceConsts.cs
@@ -0,0 +1,7 @@
+namespace Unity.AI;
+
+public static class AIRemoteServiceConsts
+{
+    public const string RemoteServiceName = "AI";
+    public const string ModuleName = "ai";
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/FodyWeavers.xml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/FodyWeavers.xml
new file mode 100644
index 0000000000..7e9f94ead6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/FodyWeavers.xsd b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
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
new file mode 100644
index 0000000000..05a8f98c81
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
@@ -0,0 +1,44 @@
+using Unity.AI.Localization;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Localization;
+using Volo.Abp.Features;
+
+namespace Unity.AI.Permissions;
+
+public class AIPermissionDefinitionProvider : PermissionDefinitionProvider
+{
+    public override void Define(IPermissionDefinitionContext context)
+    {
+            // AI Permission Group
+            var aiPermissionsGroup = context.AddGroup(
+                AIPermissions.GroupName,
+                L("Permission:AI"));
+
+
+            aiPermissionsGroup.AddPermission(
+                AIPermissions.Reporting.ReportingDefault,
+                L("Permission:AI.Reporting"))
+                .RequireFeatures("Unity.AIReporting");                
+
+            aiPermissionsGroup.AddPermission(
+                AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault,
+                L("Permission:AI.ApplicationAnalysis"))
+                 .RequireFeatures("Unity.AI.ApplicationAnalysis");
+
+            aiPermissionsGroup.AddPermission(
+                AIPermissions.AttachmentSummary.AttachmentSummaryDefault ,
+                L("Permission:AI.AttachmentSummary"))
+                 .RequireFeatures("Unity.AI.AttachmentSummaries");
+
+            aiPermissionsGroup.AddPermission(
+                AIPermissions.ScoringAssistant.ScoringAssistantDefault,
+                L("Permission:AI.ScoringAssistant"))
+                 .RequireFeatures("Unity.AI.Scoring");
+
+    }
+
+    private static LocalizableString L(string name)
+    {
+        return LocalizableString.Create<AIResource>(name);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissions.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissions.cs
new file mode 100644
index 0000000000..844a8d8e1f
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissions.cs
@@ -0,0 +1,36 @@
+using Volo.Abp.Reflection;
+
+namespace Unity.AI.Permissions;
+
+public static class AIPermissions
+{
+    public const string GroupName = "AI";
+
+    public const string Management = GroupName + ".Management";
+
+    public static class Reporting
+    {
+        public const string ReportingDefault = GroupName + ".Reporting";
+    }
+
+    public static class ApplicationAnalysis
+    {
+        public const string ApplicationAnalysisDefault = GroupName + ".ApplicationAnalysis";
+    }
+
+    public static class AttachmentSummary
+    {
+        public const string AttachmentSummaryDefault = GroupName + ".AttachmentSummary";
+    }
+
+    public static class ScoringAssistant
+    {
+        public const string ScoringAssistantDefault = GroupName + ".ScoringAssistant";
+    }        
+
+
+    public static string[] GetAll()
+    {
+        return ReflectionHelper.GetPublicConstantsRecursively(typeof(AIPermissions));
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Unity.AI.Application.Contracts.csproj b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Unity.AI.Application.Contracts.csproj
new file mode 100644
index 0000000000..cd71888469
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Unity.AI.Application.Contracts.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <RootNamespace>Unity.AI</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.Features" Version="9.1.3" />
+    <ProjectReference Include="..\Unity.AI.Domain.Shared\Unity.AI.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
+    <PackageReference Update="Fody" Version="6.9.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIAppService.cs
new file mode 100644
index 0000000000..ff3f4f8b25
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIAppService.cs
@@ -0,0 +1,11 @@
+using Volo.Abp.Application.Services;
+
+namespace Unity.AI;
+
+public abstract class AIAppService : ApplicationService
+{
+    protected AIAppService()
+    {
+        LocalizationResource = typeof(Localization.AIResource);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs
new file mode 100644
index 0000000000..874ac789db
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs
@@ -0,0 +1,11 @@
+using AutoMapper;
+
+namespace Unity.AI;
+
+public class AIApplicationAutoMapperProfile : Profile
+{
+    public AIApplicationAutoMapperProfile()
+    {
+        // Define AutoMapper mappings here as entities and DTOs are introduced
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs
new file mode 100644
index 0000000000..60974f22b4
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs
@@ -0,0 +1,56 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Modularity;
+using Volo.Abp.Application;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.VirtualFileSystem;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.TenantManagement;
+
+namespace Unity.AI;
+
+[DependsOn(
+    typeof(AIApplicationContractsModule),
+    typeof(AbpDddApplicationModule),
+    typeof(AbpAutoMapperModule),
+    typeof(AbpTenantManagementDomainModule)
+    )]
+public class AIApplicationModule : AbpModule
+{
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<IMvcBuilder>(mvcBuilder =>
+        {
+            mvcBuilder.AddApplicationPartIfNotExists(typeof(AIApplicationModule).Assembly);
+        });
+    }
+
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpMultiTenancyOptions>(options =>
+        {
+            options.IsEnabled = true;
+        });
+
+        Configure<AbpVirtualFileSystemOptions>(options =>
+        {
+            options.FileSets.AddEmbedded<AIApplicationModule>();
+        });
+
+        context.Services.AddAutoMapperObjectMapper<AIApplicationModule>();
+        Configure<AbpAutoMapperOptions>(options =>
+        {
+            options.AddMaps<AIApplicationModule>(validate: true);
+        });
+
+        context.Services.AddHttpClientProxies(
+            typeof(AIApplicationContractsModule).Assembly,
+            AIRemoteServiceConsts.RemoteServiceName
+        );
+
+        Configure<AbpAspNetCoreMvcOptions>(options =>
+        {
+            options.ConventionalControllers.Create(typeof(AIApplicationModule).Assembly);
+        });
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIDbProperties.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIDbProperties.cs
new file mode 100644
index 0000000000..d786709167
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIDbProperties.cs
@@ -0,0 +1,11 @@
+namespace Unity.AI.Domain;
+
+public static class AIDbProperties
+{
+    public static string DbTablePrefix { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Schema for Unity.AI tables — kept separate from other modules.
+    /// </summary>
+    public static string? DbSchema { get; set; } = "AI";
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs
new file mode 100644
index 0000000000..bfdb1bb031
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
+
+namespace Unity.AI.EntityFrameworkCore;
+
+public static class AIDbContextModelCreatingExtensions
+{
+    public static void ConfigureAI(this ModelBuilder modelBuilder)
+    {
+        Check.NotNull(modelBuilder, nameof(modelBuilder));
+
+        // Configure AI entities here as they are introduced.
+        // Example: modelBuilder add Entity To table and configurations
+
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/FodyWeavers.xml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/FodyWeavers.xml
new file mode 100644
index 0000000000..7e9f94ead6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/FodyWeavers.xsd b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Unity.AI.Application.csproj b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Unity.AI.Application.csproj
new file mode 100644
index 0000000000..e3be378d9b
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Unity.AI.Application.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <RootNamespace>Unity.AI</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="9.1.3" />
+    <ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\Unity.SharedKernel\Unity.SharedKernel.csproj" />
+    <ProjectReference Include="..\Unity.AI.Application.Contracts\Unity.AI.Application.Contracts.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
+    <PackageReference Update="Fody" Version="6.9.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/AISharedModule.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/AISharedModule.cs
new file mode 100644
index 0000000000..c33c032428
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/AISharedModule.cs
@@ -0,0 +1,40 @@
+using Volo.Abp.Modularity;
+using Volo.Abp.Localization;
+using Unity.AI.Localization;
+using Volo.Abp.Domain;
+using Volo.Abp.Localization.ExceptionHandling;
+using Volo.Abp.Validation;
+using Volo.Abp.Validation.Localization;
+using Volo.Abp.VirtualFileSystem;
+using Volo.Abp.Settings;
+
+namespace Unity.AI;
+
+[DependsOn(
+    typeof(AbpValidationModule),
+    typeof(AbpDddDomainSharedModule),
+    typeof(AbpSettingsModule)
+)]
+public class AIDomainSharedModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpVirtualFileSystemOptions>(options =>
+        {
+            options.FileSets.AddEmbedded<AIDomainSharedModule>();
+        });
+
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Add<AIResource>("en")
+                .AddBaseTypes(typeof(AbpValidationResource))
+                .AddVirtualJson("/Localization/AI");
+        });
+
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("AI", typeof(AIResource));
+        });
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/FodyWeavers.xml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/FodyWeavers.xml
new file mode 100644
index 0000000000..7e9f94ead6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/FodyWeavers.xsd b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
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
new file mode 100644
index 0000000000..f660d259d3
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
@@ -0,0 +1,10 @@
+{
+  "culture": "en",
+  "texts": {
+    "Permission:AI": "AI",
+    "Permission:AI.Reporting": "AI Reporting",
+    "Permission:AI.ApplicationAnalysis": "AI Application Analysis",
+    "Permission:AI.AttachmentSummary": "AI Attachment Summary",
+    "Permission:AI.ScoringAssistant": "AI Scoring Assistant"
+  }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AIResource.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AIResource.cs
new file mode 100644
index 0000000000..01c5e0b812
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AIResource.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.Localization;
+
+namespace Unity.AI.Localization;
+
+[LocalizationResourceName("AI")]
+public class AIResource
+{
+
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Unity.AI.Shared.csproj b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Unity.AI.Shared.csproj
new file mode 100644
index 0000000000..4cf3ed4e73
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Unity.AI.Shared.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <RootNamespace>Unity.AI</RootNamespace>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.Validation" Version="9.1.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\AI\*.json" />
+    <Content Remove="Localization\AI\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
+    <PackageReference Update="Fody" Version="6.9.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebAutoMapperProfile.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebAutoMapperProfile.cs
new file mode 100644
index 0000000000..91e120f831
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebAutoMapperProfile.cs
@@ -0,0 +1,11 @@
+using AutoMapper;
+
+namespace Unity.AI.Web;
+
+public class AIWebAutoMapperProfile : Profile
+{
+    public AIWebAutoMapperProfile()
+    {
+        // Define AutoMapper mappings for web layer here
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs
new file mode 100644
index 0000000000..e82f53daa7
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs
@@ -0,0 +1,44 @@
+using Microsoft.Extensions.DependencyInjection;
+using Unity.AI.Localization;
+using Volo.Abp.AspNetCore.Mvc.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Unity.AI.Web;
+
+[DependsOn(
+    typeof(AIApplicationContractsModule),
+    typeof(AbpAspNetCoreMvcUiThemeSharedModule),
+    typeof(AbpAutoMapperModule)
+    )]
+public class AIWebModule : AbpModule
+{
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
+        {
+            options.AddAssemblyResource(typeof(AIResource), typeof(AIWebModule).Assembly);
+        });
+
+        PreConfigure<IMvcBuilder>(mvcBuilder =>
+        {
+            mvcBuilder.AddApplicationPartIfNotExists(typeof(AIWebModule).Assembly);
+        });
+    }
+
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpVirtualFileSystemOptions>(options =>
+        {
+            options.FileSets.AddEmbedded<AIWebModule>();
+        });
+
+        context.Services.AddAutoMapperObjectMapper<AIWebModule>();
+        Configure<AbpAutoMapperOptions>(options =>
+        {
+            options.AddMaps<AIWebModule>(validate: true);
+        });
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/FodyWeavers.xml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/FodyWeavers.xml
new file mode 100644
index 0000000000..7e9f94ead6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/FodyWeavers.xsd b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/_ViewImports.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..7aa11381e3
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/_ViewImports.cshtml
@@ -0,0 +1,6 @@
+@using Unity.AI.Web
+@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Properties/launchSettings.json b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Properties/launchSettings.json
new file mode 100644
index 0000000000..29ff06b0cc
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Unity.AI.Web": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:57817;http://localhost:57818"
+    }
+  }
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj
new file mode 100644
index 0000000000..79de5268e6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Unity.AI.Web</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.1.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="9.1.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\**\*.css" />
+    <EmbeddedResource Include="Pages\**\*.js" />
+    <EmbeddedResource Include="Views\**\*.css" />
+    <EmbeddedResource Include="Views\**\*.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Unity.AI.Application\Unity.AI.Application.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
+    <PackageReference Update="Fody" Version="6.9.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/Unity.Flex.sln b/applications/Unity.GrantManager/modules/Unity.Flex/Unity.Flex.sln
index 1b5a13db2a..201f4dfca4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/Unity.Flex.sln
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/Unity.Flex.sln
@@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Flex.Web", "src\Unity
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Flex.HttpApi.Client.ConsoleTestApp", "test\Unity.Flex.HttpApi.Client.ConsoleTestApp\Unity.Flex.HttpApi.Client.ConsoleTestApp.csproj", "{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Flex.Installer", "src\Unity.Flex.Installer\Unity.Flex.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Flex.Installer", "src\Unity.Flex.Installer\Unity.Flex.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/Unity.Notifications.sln b/applications/Unity.GrantManager/modules/Unity.Notifications/Unity.Notifications.sln
index 9e3121eb10..b3370928f9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/Unity.Notifications.sln
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/Unity.Notifications.sln
@@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Notifications.Web", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Notifications.HttpApi.Client.ConsoleTestApp", "test\Unity.Notifications.HttpApi.Client.ConsoleTestApp\Unity.Notifications.HttpApi.Client.ConsoleTestApp.csproj", "{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Notifications.Installer", "src\Unity.Notifications.Installer\Unity.Notifications.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Notifications.Installer", "src\Unity.Notifications.Installer\Unity.Notifications.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/Unity.Payments.sln b/applications/Unity.GrantManager/modules/Unity.Payments/Unity.Payments.sln
index 235b0b5753..59281f42db 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/Unity.Payments.sln
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/Unity.Payments.sln
@@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Payments.Web", "src\U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Payments.HttpApi.Client.ConsoleTestApp", "test\Unity.Payments.HttpApi.Client.ConsoleTestApp\Unity.Payments.HttpApi.Client.ConsoleTestApp.csproj", "{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Payments.Installer", "src\Unity.Payments.Installer\Unity.Payments.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Payments.Installer", "src\Unity.Payments.Installer\Unity.Payments.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs
index be9999cd12..353515b315 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs
@@ -134,7 +134,8 @@ public async Task<List<ApplicationPaymentRollupDto>> GetBatchPaymentRollupsByCor
                             || (p.Status == PaymentRequestStatus.Submitted
                                 && string.IsNullOrEmpty(p.PaymentStatus)
                                 && (string.IsNullOrEmpty(p.InvoiceStatus)
-                                    || !p.InvoiceStatus.Contains(CasPaymentRequestStatus.ErrorFromCas))))
+                                    || (!p.InvoiceStatus.Contains(CasPaymentRequestStatus.ErrorFromCas)
+                                        && !p.InvoiceStatus.Contains(CasPaymentRequestStatus.NotFound)))))
                         .Sum(p => p.Amount)
                 })
                 .ToListAsync();
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestRepository_PaymentRollup_Tests.cs b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestRepository_PaymentRollup_Tests.cs
index 17a7da11f0..581b3d1e83 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestRepository_PaymentRollup_Tests.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestRepository_PaymentRollup_Tests.cs
@@ -212,6 +212,31 @@ await InsertPaymentRequestAsync(siteId, correlationId, 300m,
         results[0].TotalPending.ShouldBe(800m); // 500 + 300
     }
 
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task Should_Exclude_Submitted_WithNotFound_InvoiceStatus_FromPending()
+    {
+        // Arrange
+        var correlationId = Guid.NewGuid();
+        var siteId = await CreateSupplierAndSiteAsync();
+
+        using var uow = _unitOfWorkManager.Begin();
+        // NotFound invoice status - should NOT be counted as pending
+        await InsertPaymentRequestAsync(siteId, correlationId, 1000m,
+            PaymentRequestStatus.Submitted, paymentStatus: null, invoiceStatus: "NotFound");
+        // Valid pending - SHOULD be counted
+        await InsertPaymentRequestAsync(siteId, correlationId, 200m,
+            PaymentRequestStatus.Submitted, paymentStatus: null, invoiceStatus: "SentToCas");
+
+        // Act
+        var results = await _paymentRequestRepository
+            .GetBatchPaymentRollupsByCorrelationIdsAsync([correlationId]);
+
+        // Assert
+        results.Count.ShouldBe(1);
+        results[0].TotalPending.ShouldBe(200m); // Only the non-NotFound one
+    }
+
     [Fact]
     [Trait("Category", "Integration")]
     public async Task Should_Exclude_Submitted_WithErrorFromCas_FromPending()
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/Unity.Reporting.sln b/applications/Unity.GrantManager/modules/Unity.Reporting/Unity.Reporting.sln
index 0bbebbee35..c14d0cca23 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/Unity.Reporting.sln
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/Unity.Reporting.sln
@@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Reporting.Web", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Reporting.HttpApi.Client.ConsoleTestApp", "test\Unity.Reporting.HttpApi.Client.ConsoleTestApp\Unity.Reporting.HttpApi.Client.ConsoleTestApp.csproj", "{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Reporting.Installer", "src\Unity.Reporting.Installer\Unity.Reporting.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unity.Reporting.Installer", "src\Unity.Reporting.Installer\Unity.Reporting.Installer.csproj", "{BE39FD00-745B-4049-8161-FC129817CBE4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ScoresheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ScoresheetFieldsProvider.cs
index 4b856b3af3..7372d461f9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ScoresheetFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ScoresheetFieldsProvider.cs
@@ -233,7 +233,7 @@ private sealed class ScoresheetMapping
             /// Gets or sets the metadata information associated with the mapping.
             /// Contains contextual information about scoresheets and other correlation-specific details.
             /// </summary>
-            public MapMetadataDto? Metadata { get; set; }
+            public MapMetadataDto? Metadata { get; set; } = new MapMetadataDto();
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/AIJsonKeys.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/AIJsonKeys.cs
index 5ebbf4df9b..60a5b52441 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/AIJsonKeys.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/AIJsonKeys.cs
@@ -6,7 +6,10 @@ public static class AIJsonKeys
         public const string Errors = "errors";
         public const string Warnings = "warnings";
         public const string Summaries = "summaries";
-        public const string Dismissed = "dismissed";
+        public const string NextSteps = "nextSteps";
+        public const string Hidden = "hidden";
+        public const string Recommendation = "recommendation";
+        public const string Decision = "decision";
 
         public const string Id = "id";
         public const string Title = "title";
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
index 160f8ed233..d14438a2d2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Unity.GrantManager.AI
@@ -9,14 +8,7 @@ public interface IAIService
 
         Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequest request);
         Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request);
-        Task<string> GenerateAttachmentSummaryAsync(string fileName, byte[] fileContent, string contentType);
         Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request);
-        Task<ScoresheetSectionResponse> GenerateScoresheetSectionAnswersAsync(ScoresheetSectionRequest request);
-        Task<string> GenerateScoresheetSectionAnswersAsync(string applicationContent, List<string> attachmentSummaries, string sectionJson, string sectionName);
-
-        // Legacy compatibility methods retained until flow orchestration refactor.
-        Task<string> GenerateSummaryAsync(string content, string? prompt = null, int maxTokens = 150);
-        Task<string> AnalyzeApplicationAsync(string applicationContent, List<string> attachmentSummaries, string rubric, string? formFieldConfiguration = null);
-        Task<string> GenerateScoresheetAnswersAsync(string applicationContent, List<string> attachmentSummaries, string scoresheetQuestions);
+        Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(ScoresheetSectionRequest request);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
index 79785fee59..d441d29493 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
@@ -7,6 +7,9 @@ public class ApplicationAnalysisFinding
         [JsonPropertyName(AIJsonKeys.Id)]
         public string? Id { get; set; }
 
+        [JsonPropertyName(AIJsonKeys.Hidden)]
+        public bool Hidden { get; set; }
+
         [JsonPropertyName(AIJsonKeys.Title)]
         public string? Title { get; set; }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
new file mode 100644
index 0000000000..1a70d1a5f4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace Unity.GrantManager.AI
+{
+    public class ApplicationAnalysisRecommendation
+    {
+        [JsonPropertyName(AIJsonKeys.Decision)]
+        public string? Decision { get; set; }
+
+        [JsonPropertyName(AIJsonKeys.Rationale)]
+        public string? Rationale { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
index 2ec1bf8d30..74b8aa5494 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
@@ -7,9 +7,6 @@ public class AICompletionRequest
         [JsonPropertyName("userPrompt")]
         public string UserPrompt { get; set; } = string.Empty;
 
-        [JsonPropertyName("systemPrompt")]
-        public string? SystemPrompt { get; set; }
-
         [JsonPropertyName("maxTokens")]
         public int MaxTokens { get; set; } = 150;
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
index fcd809b8b8..7e3f594e16 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
@@ -14,8 +14,5 @@ public class ApplicationAnalysisRequest
 
         [JsonPropertyName("attachments")]
         public List<AIAttachmentItem> Attachments { get; set; } = new();
-
-        [JsonPropertyName("rubric")]
-        public string? Rubric { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
index e8a5afa194..705b713c00 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
@@ -17,7 +17,10 @@ public class ApplicationAnalysisResponse
         [JsonPropertyName(AIJsonKeys.Summaries)]
         public List<ApplicationAnalysisFinding> Summaries { get; set; } = new();
 
-        [JsonPropertyName(AIJsonKeys.Dismissed)]
-        public List<string> Dismissed { get; set; } = new();
+        [JsonPropertyName(AIJsonKeys.NextSteps)]
+        public List<ApplicationAnalysisFinding> NextSteps { get; set; } = new();
+
+        [JsonPropertyName(AIJsonKeys.Recommendation)]
+        public ApplicationAnalysisRecommendation? Recommendation { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs
new file mode 100644
index 0000000000..c14c38d1bd
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.GrantApplications
+{
+    public interface IApplicationAIAnalysisAppService : IApplicationService
+    {
+        Task<string> GenerateAIAnalysisAsync(Guid applicationId);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs
new file mode 100644
index 0000000000..9f18a4f4dd
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.GrantApplications
+{
+    public interface IApplicationAIScoringAppService : IApplicationService
+    {
+        Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs
index d02254aadb..234cc5e79d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs
@@ -19,8 +19,8 @@ public interface IGrantApplicationAppService
         Task<GrantApplicationDto> GetAsync(Guid id);
         Task<GrantApplicationDto> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction);
         Task<Guid?> GetAccountCodingIdFromFormIdAsync(Guid formId);
-        Task<string> DismissAIIssueAsync(Guid applicationId, string issueId);
-        Task<string> RestoreAIIssueAsync(Guid applicationId, string issueId);
+        Task<string> HideAIAnalysisItemAsync(Guid applicationId, string itemId);
+        Task<string> ShowAIAnalysisItemAsync(Guid applicationId, string itemId);
         Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplicationListInputDto input);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
index 710a9bfca0..5dae52cf3e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
@@ -1,7 +1,6 @@
 using Unity.GrantManager.Localization;
 using Unity.Modules.Shared;
 using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Features;
 using Volo.Abp.Localization;
 using Volo.Abp.SettingManagement;
 
@@ -115,32 +114,7 @@ public override void Define(IPermissionDefinitionContext context)
             //-- TAG ASSIGNMENT
             var tagsPermissionsGroup = context.AddGroup("Tags", L("Permission:Tags"));
             tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Create, L(UnitySelector.Application.Tags.Create));
-            tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Delete, L(UnitySelector.Application.Tags.Delete));
-
-            // AI Permission Group
-            var aiPermissionsGroup = context.AddGroup(
-                GrantApplicationPermissions.AI.GroupName,
-                L("Permission:AI"));
-
-            aiPermissionsGroup.AddPermission(
-                GrantApplicationPermissions.AI.Reporting.Default,
-                L("Permission:AI.Reporting"))
-                .RequireFeatures("Unity.AIReporting");
-
-            aiPermissionsGroup.AddPermission(
-                GrantApplicationPermissions.AI.ApplicationAnalysis.Default,
-                L("Permission:AI.ApplicationAnalysis"))
-                .RequireFeatures("Unity.AI.ApplicationAnalysis");
-
-            aiPermissionsGroup.AddPermission(
-                GrantApplicationPermissions.AI.AttachmentSummary.Default,
-                L("Permission:AI.AttachmentSummary"))
-                .RequireFeatures("Unity.AI.AttachmentSummaries");
-
-            aiPermissionsGroup.AddPermission(
-                GrantApplicationPermissions.AI.ScoringAssistant.Default,
-                L("Permission:AI.ScoringAssistant"))
-                .RequireFeatures("Unity.AI.Scoring");
+            tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Delete, L(UnitySelector.Application.Tags.Delete));           
         }
 
         private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationAnalysisService.cs
new file mode 100644
index 0000000000..2234f9ef8d
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationAnalysisService.cs
@@ -0,0 +1,191 @@
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.AI
+{
+    public class ApplicationAnalysisService(
+        IApplicationRepository applicationRepository,
+        IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
+        IApplicationFormVersionRepository applicationFormVersionRepository,
+        IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+        IAIService aiService,
+        ILogger<ApplicationAnalysisService> logger) : IApplicationAnalysisService, ITransientDependency
+    {
+        private readonly JsonSerializerOptions _jsonOptionsIndented = new()
+        {
+            WriteIndented = true
+        };
+
+        private const string ComponentsKey = "components";
+
+        public async Task<string> RegenerateAndSaveAsync(Guid applicationId)
+        {
+            var application = await applicationRepository.GetAsync(applicationId);
+            var formSubmission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
+            var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
+
+            var attachmentSummaries = attachments
+                .Where(a => !string.IsNullOrWhiteSpace(a.AISummary))
+                .Select(a => new AIAttachmentItem
+                {
+                    Name = string.IsNullOrWhiteSpace(a.FileName) ? "attachment" : a.FileName.Trim(),
+                    Summary = a.AISummary!.Trim()
+                })
+                .ToList();
+
+            var notSpecified = "Not specified";
+            var applicationContent = $@"
+Project Name: {application.ProjectName}
+Reference Number: {application.ReferenceNo}
+Requested Amount: ${application.RequestedAmount:N2}
+Total Project Budget: ${application.TotalProjectBudget:N2}
+Project Summary: {application.ProjectSummary ?? "Not provided"}
+City: {application.City ?? notSpecified}
+Economic Region: {application.EconomicRegion ?? notSpecified}
+Community: {application.Community ?? notSpecified}
+Project Start Date: {application.ProjectStartDate?.ToShortDateString() ?? notSpecified}
+Project End Date: {application.ProjectEndDate?.ToShortDateString() ?? notSpecified}
+Submission Date: {application.SubmissionDate.ToShortDateString()}
+
+FULL APPLICATION FORM SUBMISSION:
+{formSubmission?.RenderedHTML ?? "Form submission content not available"}
+";
+
+            object formFieldConfiguration = new { message = "Form configuration not available." };
+            if (formSubmission?.ApplicationFormVersionId != null)
+            {
+                formFieldConfiguration = await ExtractFormFieldConfigurationAsync(formSubmission.ApplicationFormVersionId.Value);
+            }
+
+            var analysis = await aiService.GenerateApplicationAnalysisAsync(new ApplicationAnalysisRequest
+            {
+                Schema = JsonSerializer.SerializeToElement(formFieldConfiguration),
+                Data = JsonSerializer.SerializeToElement(new { submission_content = applicationContent }),
+                Attachments = attachmentSummaries
+            });
+
+            var analysisJson = JsonSerializer.Serialize(analysis, _jsonOptionsIndented);
+            application.AIAnalysis = analysisJson;
+            await applicationRepository.UpdateAsync(application);
+            return analysisJson;
+        }
+
+        private async Task<object> ExtractFormFieldConfigurationAsync(Guid formVersionId)
+        {
+            try
+            {
+                var formVersion = await applicationFormVersionRepository.GetAsync(formVersionId);
+                if (formVersion == null || string.IsNullOrEmpty(formVersion.FormSchema))
+                {
+                    return new { message = "Form configuration not available." };
+                }
+
+                var schema = JObject.Parse(formVersion.FormSchema);
+                var components = schema[ComponentsKey] as JArray;
+                if (components == null || components.Count == 0)
+                {
+                    return new { message = "No form fields configured." };
+                }
+
+                var requiredFields = new List<string>();
+                var optionalFields = new List<string>();
+                ExtractFieldRequirements(components, requiredFields, optionalFields, string.Empty);
+
+                return new
+                {
+                    required_fields = requiredFields,
+                    optional_fields = optionalFields
+                };
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error extracting form field configuration for form version {FormVersionId}", formVersionId);
+                return new { message = "Form configuration could not be extracted." };
+            }
+        }
+
+        private static void ExtractFieldRequirements(JArray components, List<string> requiredFields, List<string> optionalFields, string currentPath)
+        {
+            foreach (var component in components.OfType<JObject>())
+            {
+                var key = component["key"]?.ToString();
+                var label = component["label"]?.ToString();
+                var type = component["type"]?.ToString();
+                var skipTypes = new HashSet<string> { "button", "simplebuttonadvanced", "html", "htmlelement", "content", "simpleseparator" };
+
+                if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(type) || skipTypes.Contains(type))
+                {
+                    ProcessNestedFieldRequirements(component, type, requiredFields, optionalFields, currentPath);
+                    continue;
+                }
+
+                var displayName = !string.IsNullOrEmpty(label) ? $"{label} ({key})" : key;
+                var fullPath = string.IsNullOrEmpty(currentPath) ? displayName : $"{currentPath} > {displayName}";
+                var validate = component["validate"] as JObject;
+                var isRequired = validate?["required"]?.Value<bool>() ?? false;
+
+                if (component["input"]?.Value<bool>() == true)
+                {
+                    if (isRequired) requiredFields.Add(fullPath);
+                    else optionalFields.Add(fullPath);
+                }
+
+                ProcessNestedFieldRequirements(component, type, requiredFields, optionalFields, fullPath);
+            }
+        }
+
+        private static void ProcessNestedFieldRequirements(JObject component, string? type, List<string> requiredFields, List<string> optionalFields, string currentPath)
+        {
+            switch (type)
+            {
+                case "panel":
+                case "simplepanel":
+                case "fieldset":
+                case "well":
+                case "container":
+                case "datagrid":
+                case "table":
+                    if (component[ComponentsKey] is JArray nestedComponents)
+                    {
+                        ExtractFieldRequirements(nestedComponents, requiredFields, optionalFields, currentPath);
+                    }
+                    break;
+                case "columns":
+                case "simplecols2":
+                case "simplecols3":
+                case "simplecols4":
+                    if (component["columns"] is JArray columns)
+                    {
+                        foreach (var column in columns.OfType<JObject>())
+                        {
+                            if (column[ComponentsKey] is JArray columnComponents)
+                            {
+                                ExtractFieldRequirements(columnComponents, requiredFields, optionalFields, currentPath);
+                            }
+                        }
+                    }
+                    break;
+                case "tabs":
+                case "simpletabs":
+                    if (component[ComponentsKey] is JArray tabs)
+                    {
+                        foreach (var tab in tabs.OfType<JObject>())
+                        {
+                            if (tab[ComponentsKey] is JArray tabComponents)
+                            {
+                                ExtractFieldRequirements(tabComponents, requiredFields, optionalFields, currentPath);
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationScoresheetAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationScoresheetAnalysisService.cs
new file mode 100644
index 0000000000..dcef966ea1
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationScoresheetAnalysisService.cs
@@ -0,0 +1,170 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.Flex.Domain.Scoresheets;
+using Unity.GrantManager.Applications;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.AI
+{
+    public class ApplicationScoresheetAnalysisService(
+        IApplicationRepository applicationRepository,
+        IApplicationFormRepository applicationFormRepository,
+        IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
+        IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+        IScoresheetRepository scoresheetRepository,
+        IAIService aiService,
+        ILogger<ApplicationScoresheetAnalysisService> logger) : IApplicationScoresheetAnalysisService, ITransientDependency
+    {
+        private readonly JsonSerializerOptions _jsonOptions = new()
+        {
+            WriteIndented = true,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+        };
+
+        private readonly JsonSerializerOptions _jsonOptionsIndented = new()
+        {
+            WriteIndented = true
+        };
+
+        public async Task<string> RegenerateAndSaveAsync(Guid applicationId)
+        {
+            var application = await applicationRepository.GetAsync(applicationId);
+            var applicationForm = await applicationFormRepository.GetAsync(application.ApplicationFormId);
+            if (applicationForm.ScoresheetId == null)
+            {
+                return "{}";
+            }
+
+            var scoresheet = await scoresheetRepository.GetWithChildrenAsync(applicationForm.ScoresheetId.Value);
+            if (scoresheet == null)
+            {
+                return "{}";
+            }
+
+            var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
+            var attachmentSummaries = attachments
+                .Where(a => !string.IsNullOrEmpty(a.AISummary))
+                .Select(a => new AIAttachmentItem
+                {
+                    Name = string.IsNullOrWhiteSpace(a.FileName) ? "attachment" : a.FileName.Trim(),
+                    Summary = a.AISummary!.Trim()
+                })
+                .ToList();
+
+            var formSubmission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
+            var notSpecified = "Not specified";
+            var applicationContent = $@"
+Project Name: {application.ProjectName}
+Reference Number: {application.ReferenceNo}
+Requested Amount: ${application.RequestedAmount:N2}
+Total Project Budget: ${application.TotalProjectBudget:N2}
+Project Summary: {application.ProjectSummary ?? "Not provided"}
+City: {application.City ?? notSpecified}
+Economic Region: {application.EconomicRegion ?? notSpecified}
+Community: {application.Community ?? notSpecified}
+Project Start Date: {application.ProjectStartDate?.ToShortDateString() ?? notSpecified}
+Project End Date: {application.ProjectEndDate?.ToShortDateString() ?? notSpecified}
+Submission Date: {application.SubmissionDate.ToShortDateString()}
+
+FULL APPLICATION FORM SUBMISSION:
+{formSubmission?.RenderedHTML ?? "Form submission content not available"}
+";
+
+            var allSectionResults = new Dictionary<string, object>();
+            foreach (var section in scoresheet.Sections.OrderBy(s => s.Order))
+            {
+                try
+                {
+                    var sectionQuestionsData = new List<object>();
+                    foreach (var field in section.Fields.OrderBy(f => f.Order))
+                    {
+                        sectionQuestionsData.Add(new
+                        {
+                            id = field.Id.ToString(),
+                            question = field.Label,
+                            description = field.Description,
+                            type = field.Type.ToString(),
+                            definition = field.Definition,
+                            availableOptions = ExtractSelectListOptions(field)
+                        });
+                    }
+
+                    var sectionRequest = new ScoresheetSectionRequest
+                    {
+                        Data = JsonSerializer.SerializeToElement(new { submission_content = applicationContent }),
+                        Attachments = attachmentSummaries,
+                        SectionName = section.Name,
+                        SectionSchema = JsonSerializer.SerializeToElement(sectionQuestionsData, _jsonOptions)
+                    };
+                    var sectionAnswers = await aiService.GenerateScoresheetSectionAsync(sectionRequest);
+
+                    if (sectionAnswers.Answers.Count > 0)
+                    {
+                        var sectionJson = JsonSerializer.Serialize(sectionAnswers.Answers, _jsonOptions);
+                        using var sectionDoc = JsonDocument.Parse(sectionJson);
+                        foreach (var property in sectionDoc.RootElement.EnumerateObject())
+                        {
+                            allSectionResults[property.Name] = property.Value.Clone();
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "Error processing AI scoresheet section {SectionName} for application {ApplicationId}", section.Name, applicationId);
+                }
+            }
+
+            var combinedResults = JsonSerializer.Serialize(allSectionResults, _jsonOptionsIndented);
+            var validatedJson = ValidateScoresheetJson(combinedResults);
+            application.AIScoresheetAnswers = validatedJson;
+            await applicationRepository.UpdateAsync(application);
+
+            return validatedJson;
+        }
+
+        private static string ValidateScoresheetJson(string scoresheetAnswers)
+        {
+            try
+            {
+                if (!string.IsNullOrWhiteSpace(scoresheetAnswers))
+                {
+                    using var _ = JsonDocument.Parse(scoresheetAnswers);
+                    return scoresheetAnswers;
+                }
+            }
+            catch (JsonException)
+            {
+                // Fall back to empty object for invalid JSON.
+            }
+
+            return "{}";
+        }
+
+        private static (int number, string value, long numericValue)[]? ExtractSelectListOptions(Question field)
+        {
+            if (field.Type != Unity.Flex.Scoresheets.Enums.QuestionType.SelectList || string.IsNullOrEmpty(field.Definition))
+                return null;
+
+            try
+            {
+                var definition = JsonSerializer.Deserialize<Unity.Flex.Worksheets.Definitions.QuestionSelectListDefinition>(field.Definition);
+                if (definition?.Options != null && definition.Options.Count > 0)
+                {
+                    return definition.Options
+                        .Select((option, index) => (number: index, value: option.Value, numericValue: option.NumericValue))
+                        .ToArray();
+                }
+            }
+            catch (JsonException)
+            {
+                // Ignore malformed definition and return null options.
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationAnalysisService.cs
new file mode 100644
index 0000000000..cdb31bf8b2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationAnalysisService.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Unity.GrantManager.AI
+{
+    public interface IApplicationAnalysisService
+    {
+        Task<string> RegenerateAndSaveAsync(Guid applicationId);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationScoresheetAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationScoresheetAnalysisService.cs
new file mode 100644
index 0000000000..73a272fd3f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationScoresheetAnalysisService.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Unity.GrantManager.AI
+{
+    public interface IApplicationScoresheetAnalysisService
+    {
+        Task<string> RegenerateAndSaveAsync(Guid applicationId);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/OpenAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/OpenAIService.cs
index 418c31ebcf..063968a272 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/OpenAIService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/OpenAIService.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -20,8 +21,16 @@ public class OpenAIService : IAIService, ITransientDependency
         private readonly ITextExtractionService _textExtractionService;
         private const string ApplicationAnalysisPromptType = "ApplicationAnalysis";
         private const string AttachmentSummaryPromptType = "AttachmentSummary";
-        private const string ScoresheetAllPromptType = "ScoresheetAll";
         private const string ScoresheetSectionPromptType = "ScoresheetSection";
+        private const string PromptVersionV0 = "v0";
+        private const string PromptVersionV1 = "v1";
+        private static readonly string PromptTemplatesFolder = Path.Combine("AI", "Prompts", "Versions");
+        private const string AnalysisSystemTemplateName = "analysis.system";
+        private const string AnalysisUserTemplateName = "analysis.user";
+        private const string AttachmentSystemTemplateName = "attachment.system";
+        private const string AttachmentUserTemplateName = "attachment.user";
+        private const string ScoresheetSystemTemplateName = "scoresheet.system";
+        private const string ScoresheetUserTemplateName = "scoresheet.user";
         private const string NoSummaryGeneratedMessage = "No summary generated.";
         private const string ServiceNotConfiguredMessage = "AI analysis not available - service not configured.";
         private const string ServiceTemporarilyUnavailableMessage = "AI analysis failed - service temporarily unavailable.";
@@ -39,6 +48,16 @@ public class OpenAIService : IAIService, ITransientDependency
 
         private static readonly JsonSerializerOptions JsonLogOptions = new() { WriteIndented = true };
 
+        private static readonly Dictionary<string, string> PromptProfiles =
+            new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                [PromptVersionV0] = PromptVersionV0,
+                [PromptVersionV1] = PromptVersionV1
+            };
+        private static readonly ConcurrentDictionary<string, string> PromptTemplateCache = new(StringComparer.OrdinalIgnoreCase);
+
+        private string SelectedPromptVersion => ResolvePromptVersion(_configuration["Azure:OpenAI:PromptVersion"]);
+
         public OpenAIService(
             HttpClient httpClient,
             IConfiguration configuration,
@@ -66,15 +85,16 @@ public async Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequ
         {
             var content = await GenerateSummaryAsync(
                 request?.UserPrompt ?? string.Empty,
-                request?.SystemPrompt,
-                request?.MaxTokens ?? 150);
+                null,
+                request?.MaxTokens ?? 150,
+                request?.Temperature);
             return new AICompletionResponse { Content = content };
         }
 
         public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request)
         {
-            var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
-            var schemaJson = JsonSerializer.Serialize(request.Schema, JsonLogOptions);
+            var data = JsonSerializer.Serialize(request.Data, JsonLogOptions);
+            var schema = JsonSerializer.Serialize(request.Schema, JsonLogOptions);
 
             var attachmentsPayload = request.Attachments
                 .Select(a => new
@@ -84,20 +104,24 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 })
                 .Cast<object>();
 
-            var analysisContent = AnalysisPrompts.BuildUserPrompt(
-                schemaJson,
-                dataJson,
-                JsonSerializer.Serialize(attachmentsPayload, JsonLogOptions),
-                request.Rubric ?? string.Empty);
-
-            var systemPrompt = AnalysisPrompts.SystemPrompt;
+            var attachments = JsonSerializer.Serialize(attachmentsPayload, JsonLogOptions);
+            var systemPrompt = BuildAnalysisSystemPrompt(SelectedPromptVersion);
+            var analysisContent = BuildAnalysisUserPrompt(
+                SelectedPromptVersion,
+                schema,
+                data,
+                attachments);
             await LogPromptInputAsync(ApplicationAnalysisPromptType, systemPrompt, analysisContent);
             var raw = await GenerateSummaryAsync(analysisContent, systemPrompt, 1000);
             await LogPromptOutputAsync(ApplicationAnalysisPromptType, raw);
             return ParseApplicationAnalysisResponse(AddIdsToAnalysisItems(raw));
         }
 
-        public async Task<string> GenerateSummaryAsync(string content, string? prompt = null, int maxTokens = 150)
+        private async Task<string> GenerateSummaryAsync(
+            string content,
+            string? systemPrompt,
+            int maxTokens = 150,
+            double? temperature = null)
         {
             if (string.IsNullOrEmpty(ApiKey))
             {
@@ -109,18 +133,20 @@ public async Task<string> GenerateSummaryAsync(string content, string? prompt =
 
             try
             {
-                var systemPrompt = prompt ?? "You are a professional grant analyst for the BC Government.";
+                var resolvedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt)
+                    ? "You are a professional grant analyst for the BC Government."
+                    : systemPrompt;
                 var userPrompt = content ?? string.Empty;
 
                 var requestBody = new
                 {
                     messages = new[]
                     {
-                       new { role = "system", content = systemPrompt },
+                       new { role = "system", content = resolvedSystemPrompt },
                        new { role = "user", content = userPrompt }
                    },
                     max_tokens = maxTokens,
-                    temperature = 0.3
+                    temperature = temperature ?? 0.3
                 };
 
                 var json = JsonSerializer.Serialize(requestBody);
@@ -165,17 +191,16 @@ public async Task<string> GenerateSummaryAsync(string content, string? prompt =
             }
         }
 
-        public async Task<string> GenerateAttachmentSummaryAsync(string fileName, byte[] fileContent, string contentType)
+        public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request)
         {
+            var fileName = request?.FileName ?? string.Empty;
+            var fileContent = request?.FileContent ?? Array.Empty<byte>();
+            var contentType = request?.ContentType ?? "application/octet-stream";
+
             try
             {
                 var extractedText = await _textExtractionService.ExtractTextAsync(fileName, fileContent, contentType);
-
-                var prompt = $@"{AttachmentPrompts.SystemPrompt}
-
-{AttachmentPrompts.OutputSection}
-
-{AttachmentPrompts.RulesSection}";
+                var prompt = BuildAttachmentSystemPrompt(SelectedPromptVersion);
 
                 var attachmentText = string.IsNullOrWhiteSpace(extractedText) ? null : extractedText;
                 if (attachmentText != null)
@@ -194,88 +219,25 @@ public async Task<string> GenerateAttachmentSummaryAsync(string fileName, byte[]
                     sizeBytes = fileContent.Length,
                     text = attachmentText
                 };
-                var contentToAnalyze = AttachmentPrompts.BuildUserPrompt(
-                    JsonSerializer.Serialize(attachmentPayload, JsonLogOptions));
+                var attachment = JsonSerializer.Serialize(attachmentPayload, JsonLogOptions);
+                var contentToAnalyze = BuildAttachmentUserPrompt(SelectedPromptVersion, attachment);
 
                 await LogPromptInputAsync(AttachmentSummaryPromptType, prompt, contentToAnalyze);
                 var modelOutput = await GenerateSummaryAsync(contentToAnalyze, prompt, 150);
                 await LogPromptOutputAsync(AttachmentSummaryPromptType, modelOutput);
-                return modelOutput;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating attachment summary for {FileName}", fileName);
-                return $"AI analysis not available for this attachment ({fileName}).";
-            }
-        }
-
-        public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request)
-        {
-            var summary = await GenerateAttachmentSummaryAsync(
-                request?.FileName ?? string.Empty,
-                request?.FileContent ?? Array.Empty<byte>(),
-                request?.ContentType ?? "application/octet-stream");
-            return new AttachmentSummaryResponse { Summary = summary };
-        }
-
-        public async Task<string> AnalyzeApplicationAsync(string applicationContent, List<string> attachmentSummaries, string rubric, string? formFieldConfiguration = null)
-        {
-            if (string.IsNullOrEmpty(ApiKey))
-            {
-                _logger.LogWarning("{Message}", MissingApiKeyMessage);
-                return ServiceNotConfiguredMessage;
-            }
-
-            try
-            {
-                object schemaPayload = new { };
-                if (!string.IsNullOrWhiteSpace(formFieldConfiguration))
-                {
-                    try
-                    {
-                        using var schemaDoc = JsonDocument.Parse(formFieldConfiguration);
-                        schemaPayload = schemaDoc.RootElement.Clone();
-                    }
-                    catch (JsonException ex)
-                    {
-                        _logger.LogWarning(ex, "Invalid form field configuration JSON. Using empty schema payload.");
-                    }
-                }
 
-                var dataPayload = new
+                return new AttachmentSummaryResponse
                 {
-                    applicationContent
+                    Summary = ExtractSummaryFromJson(modelOutput)
                 };
-
-                var attachmentsPayload = attachmentSummaries?.Count > 0
-                    ? attachmentSummaries
-                        .Select((summary, index) => new
-                        {
-                            name = $"Attachment {index + 1}",
-                            summary = summary
-                        })
-                        .Cast<object>()
-                    : Enumerable.Empty<object>();
-
-                var analysisContent = AnalysisPrompts.BuildUserPrompt(
-                    JsonSerializer.Serialize(schemaPayload, JsonLogOptions),
-                    JsonSerializer.Serialize(dataPayload, JsonLogOptions),
-                    JsonSerializer.Serialize(attachmentsPayload, JsonLogOptions),
-                    rubric);
-
-                var systemPrompt = AnalysisPrompts.SystemPrompt;
-
-                await LogPromptInputAsync(ApplicationAnalysisPromptType, systemPrompt, analysisContent);
-                var rawAnalysis = await GenerateSummaryAsync(analysisContent, systemPrompt, 1000);
-                await LogPromptOutputAsync(ApplicationAnalysisPromptType, rawAnalysis);
-
-                // Post-process the AI response to add unique IDs to errors and warnings
-                return AddIdsToAnalysisItems(rawAnalysis);
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error analyzing application");
-                return SummaryFailedRetryMessage;
+                _logger.LogError(ex, "Error generating attachment summary for {FileName}", fileName);
+                return new AttachmentSummaryResponse
+                {
+                    Summary = $"AI analysis not available for this attachment ({fileName})."
+                };
             }
         }
 
@@ -293,7 +255,10 @@ private string AddIdsToAnalysisItems(string analysisJson)
                     {
                         var outputPropertyName = property.Name;
 
-                        if (outputPropertyName == AIJsonKeys.Errors || outputPropertyName == AIJsonKeys.Warnings)
+                        if (outputPropertyName == AIJsonKeys.Errors ||
+                            outputPropertyName == AIJsonKeys.Warnings ||
+                            outputPropertyName == AIJsonKeys.Summaries ||
+                            outputPropertyName == AIJsonKeys.NextSteps)
                         {
                             writer.WritePropertyName(outputPropertyName);
                             writer.WriteStartArray();
@@ -304,10 +269,16 @@ private string AddIdsToAnalysisItems(string analysisJson)
 
                                 // Add unique ID first
                                 writer.WriteString("id", Guid.NewGuid().ToString());
+                                writer.WriteBoolean(AIJsonKeys.Hidden, false);
 
                                 // Copy existing properties
                                 foreach (var itemProperty in item.EnumerateObject())
                                 {
+                                    if (itemProperty.NameEquals(AIJsonKeys.Id) || itemProperty.NameEquals(AIJsonKeys.Hidden))
+                                    {
+                                        continue;
+                                    }
+
                                     itemProperty.WriteTo(writer);
                                 }
 
@@ -329,14 +300,6 @@ private string AddIdsToAnalysisItems(string analysisJson)
                         }
                     }
 
-                    // Add dismissed array if not present.
-                    if (!jsonDoc.RootElement.TryGetProperty(AIJsonKeys.Dismissed, out _))
-                    {
-                        writer.WritePropertyName(AIJsonKeys.Dismissed);
-                        writer.WriteStartArray();
-                        writer.WriteEndArray();
-                    }
-
                     writer.WriteEndObject();
                 }
 
@@ -349,75 +312,25 @@ private string AddIdsToAnalysisItems(string analysisJson)
             }
         }
 
-        public async Task<string> GenerateScoresheetAnswersAsync(string applicationContent, List<string> attachmentSummaries, string scoresheetQuestions)
+        public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(ScoresheetSectionRequest request)
         {
-            if (string.IsNullOrEmpty(ApiKey))
-            {
-                _logger.LogWarning("{Message}", MissingApiKeyMessage); 
-                return "{}";
-            }
-
-            try
-            {
-                var attachmentSummariesText = attachmentSummaries?.Count > 0
-                    ? string.Join("\n- ", attachmentSummaries.Select((s, i) => $"Attachment {i + 1}: {s}"))
-                    : "No attachments provided.";
-
-                var analysisContent = $@"APPLICATION CONTENT:
-{applicationContent}
-
-ATTACHMENT SUMMARIES:
-- {attachmentSummariesText}
-
-SCORESHEET QUESTIONS:
-{scoresheetQuestions}
-
-Please analyze this grant application and provide appropriate answers for each scoresheet question.
-
-For numeric questions, provide a numeric value within the specified range.
-For yes/no questions, provide either 'Yes' or 'No'.
-For text questions, provide a concise, relevant response.
-For select list questions, choose the most appropriate option from the provided choices.
-For text area questions, provide a detailed but concise response.
-
-Base your answers on the application content and attachment summaries provided. Be objective and fair in your assessment.
-
-Return your response as a JSON object where each key is the question ID and the value is the appropriate answer:
-{{
-  ""question-id-1"": ""answer-value-1"",
-  ""question-id-2"": ""answer-value-2""
-}}
-Do not return any markdown formatting, just the JSON by itself";
-
-                var systemPrompt = @"You are an expert grant application reviewer for the BC Government.
-Analyze the provided application and generate appropriate answers for the scoresheet questions based on the application content.
-Be thorough, objective, and fair in your assessment. Base your answers strictly on the provided application content.
-Respond only with valid JSON in the exact format requested.";
+            var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
+            var sectionJson = JsonSerializer.Serialize(request.SectionSchema, JsonLogOptions);
 
-                await LogPromptInputAsync(ScoresheetAllPromptType, systemPrompt, analysisContent);
-                var modelOutput = await GenerateSummaryAsync(analysisContent, systemPrompt, 2000);
-                await LogPromptOutputAsync(ScoresheetAllPromptType, modelOutput);
-                return modelOutput;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating scoresheet answers");
-                return "{}";
-            }
-        }
+            var attachmentSummaries = request.Attachments
+                .Select(a => $"{a.Name}: {a.Summary}")
+                .ToList();
 
-        public async Task<string> GenerateScoresheetSectionAnswersAsync(string applicationContent, List<string> attachmentSummaries, string sectionJson, string sectionName)
-        {
             if (string.IsNullOrEmpty(ApiKey))
             {
                 _logger.LogWarning("{Message}", MissingApiKeyMessage);
-                return "{}";
+                return new ScoresheetSectionResponse();
             }
 
             try
             {
-                var attachmentSummariesText = attachmentSummaries?.Count > 0
-                    ? string.Join("\n- ", attachmentSummaries.Select((s, i) => $"Attachment {i + 1}: {s}"))
+                var attachments = attachmentSummaries.Count > 0
+                    ? string.Join("\n- ", attachmentSummaries.Select((summary, index) => $"Attachment {index + 1}: {summary}"))
                     : "No attachments provided.";
 
                 object sectionQuestionsPayload = sectionJson;
@@ -436,49 +349,40 @@ public async Task<string> GenerateScoresheetSectionAnswersAsync(string applicati
 
                 var sectionPayload = new
                 {
-                    name = sectionName,
+                    name = request.SectionName,
                     questions = sectionQuestionsPayload
                 };
-                var sectionPayloadJson = JsonSerializer.Serialize(sectionPayload, JsonLogOptions);
-                var responseTemplate = BuildScoresheetSectionResponseTemplate(sectionPayloadJson);
-
-                var analysisContent = ScoresheetPrompts.BuildSectionUserPrompt(
-                    applicationContent,
-                    attachmentSummariesText,
-                    sectionPayloadJson,
-                    responseTemplate);
+                var section = JsonSerializer.Serialize(sectionPayload, JsonLogOptions);
+                var response = BuildScoresheetSectionResponseTemplate(section);
+                if (response == "{}")
+                {
+                    _logger.LogWarning(
+                        "Skipping AI scoresheet generation for section {SectionName} because response template could not be built from section schema.",
+                        request.SectionName);
+                    return new ScoresheetSectionResponse();
+                }
 
-                var systemPrompt = ScoresheetPrompts.SectionSystemPrompt;
+                var analysisContent = BuildScoresheetSectionUserPrompt(
+                    SelectedPromptVersion,
+                    dataJson,
+                    attachments,
+                    section,
+                    response);
+                var systemPrompt = BuildScoresheetSectionSystemPrompt(SelectedPromptVersion);
 
                 await LogPromptInputAsync(ScoresheetSectionPromptType, systemPrompt, analysisContent);
                 var modelOutput = await GenerateSummaryAsync(analysisContent, systemPrompt, 2000);
                 await LogPromptOutputAsync(ScoresheetSectionPromptType, modelOutput);
-                return modelOutput;
+
+                return ParseScoresheetSectionResponse(modelOutput);
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error generating scoresheet section answers for section {SectionName}", sectionName);
-                return "{}";
+                _logger.LogError(ex, "Error generating scoresheet section answers for section {SectionName}", request.SectionName);
+                return new ScoresheetSectionResponse();
             }
         }
 
-        public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAnswersAsync(ScoresheetSectionRequest request)
-        {
-            var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
-            var sectionJson = JsonSerializer.Serialize(request.SectionSchema, JsonLogOptions);
-
-            var attachmentSummaries = request.Attachments
-                .Select(a => $"{a.Name}: {a.Summary}")
-                .ToList();
-
-            var raw = await GenerateScoresheetSectionAnswersAsync(
-                dataJson,
-                attachmentSummaries,
-                sectionJson,
-                request.SectionName);
-            return ParseScoresheetSectionResponse(raw);
-        }
-
         private static ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
         {
             var response = new ApplicationAnalysisResponse();
@@ -508,14 +412,14 @@ private static ApplicationAnalysisResponse ParseApplicationAnalysisResponse(stri
                 response.Summaries = ParseFindings(summaries);
             }
 
-            if (root.TryGetProperty(AIJsonKeys.Dismissed, out var dismissed) && dismissed.ValueKind == JsonValueKind.Array)
+            if (root.TryGetProperty(AIJsonKeys.NextSteps, out var nextSteps) && nextSteps.ValueKind == JsonValueKind.Array)
+            {
+                response.NextSteps = ParseFindings(nextSteps);
+            }
+
+            if (root.TryGetProperty(AIJsonKeys.Recommendation, out var recommendation) && recommendation.ValueKind == JsonValueKind.Object)
             {
-                response.Dismissed = dismissed
-                    .EnumerateArray()
-                    .Select(GetStringValueOrNull)
-                    .Where(item => !string.IsNullOrWhiteSpace(item))
-                    .Cast<string>()
-                    .ToList();
+                response.Recommendation = ParseRecommendation(recommendation);
             }
 
             return response;
@@ -533,16 +437,6 @@ private static bool TryGetStringProperty(JsonElement root, string propertyName,
             return !string.IsNullOrWhiteSpace(value);
         }
 
-        private static string? GetStringValueOrNull(JsonElement element)
-        {
-            if (element.ValueKind == JsonValueKind.String)
-            {
-                return element.GetString();
-            }
-
-            return null;
-        }
-
         private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
         {
             var findings = new List<ApplicationAnalysisFinding>();
@@ -556,31 +450,25 @@ private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
                 var id = item.TryGetProperty(AIJsonKeys.Id, out var idProp) && idProp.ValueKind == JsonValueKind.String
                     ? idProp.GetString()
                     : null;
+                var hidden = item.TryGetProperty(AIJsonKeys.Hidden, out var hiddenProp) &&
+                    (hiddenProp.ValueKind == JsonValueKind.True || hiddenProp.ValueKind == JsonValueKind.False) &&
+                    hiddenProp.GetBoolean();
                 string? title = null;
                 if (item.TryGetProperty(AIJsonKeys.Title, out var titleProp) && titleProp.ValueKind == JsonValueKind.String)
                 {
                     title = titleProp.GetString();
                 }
-                else if (item.TryGetProperty("category", out var legacyTitleProp) &&
-                         legacyTitleProp.ValueKind == JsonValueKind.String)
-                {
-                    title = legacyTitleProp.GetString();
-                }
 
                 string? detail = null;
                 if (item.TryGetProperty(AIJsonKeys.Detail, out var detailProp) && detailProp.ValueKind == JsonValueKind.String)
                 {
                     detail = detailProp.GetString();
                 }
-                else if (item.TryGetProperty("message", out var legacyDetailProp) &&
-                         legacyDetailProp.ValueKind == JsonValueKind.String)
-                {
-                    detail = legacyDetailProp.GetString();
-                }
 
                 findings.Add(new ApplicationAnalysisFinding
                 {
                     Id = id,
+                    Hidden = hidden,
                     Title = title,
                     Detail = detail
                 });
@@ -589,6 +477,34 @@ private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
             return findings;
         }
 
+        private static ApplicationAnalysisRecommendation? ParseRecommendation(JsonElement recommendation)
+        {
+            string? decision = null;
+            if (recommendation.TryGetProperty(AIJsonKeys.Decision, out var decisionProp) &&
+                decisionProp.ValueKind == JsonValueKind.String)
+            {
+                decision = decisionProp.GetString();
+            }
+
+            string? rationale = null;
+            if (recommendation.TryGetProperty(AIJsonKeys.Rationale, out var rationaleProp) &&
+                rationaleProp.ValueKind == JsonValueKind.String)
+            {
+                rationale = rationaleProp.GetString();
+            }
+
+            if (string.IsNullOrWhiteSpace(decision) && string.IsNullOrWhiteSpace(rationale))
+            {
+                return null;
+            }
+
+            return new ApplicationAnalysisRecommendation
+            {
+                Decision = decision,
+                Rationale = rationale
+            };
+        }
+
         private static ScoresheetSectionResponse ParseScoresheetSectionResponse(string raw)
         {
             var response = new ScoresheetSectionResponse();
@@ -642,7 +558,7 @@ private static string BuildScoresheetSectionResponseTemplate(string sectionPaylo
                 using var doc = JsonDocument.Parse(sectionPayloadJson);
                 if (!doc.RootElement.TryGetProperty("questions", out var questions) || questions.ValueKind != JsonValueKind.Array)
                 {
-                    return ScoresheetPrompts.SectionOutputTemplate;
+                    return "{}";
                 }
 
                 var template = new Dictionary<string, object>();
@@ -669,28 +585,28 @@ private static string BuildScoresheetSectionResponseTemplate(string sectionPaylo
 
                 if (template.Count == 0)
                 {
-                    return ScoresheetPrompts.SectionOutputTemplate;
+                    return "{}";
                 }
 
                 return JsonSerializer.Serialize(template, JsonLogOptions);
             }
             catch (JsonException)
             {
-                return ScoresheetPrompts.SectionOutputTemplate;
+                return "{}";
             }
         }
 
         private async Task LogPromptInputAsync(string promptType, string? systemPrompt, string userPrompt)
         {
             var formattedInput = FormatPromptInputForLog(systemPrompt, userPrompt);
-            _logger.LogInformation("AI {PromptType} input payload: {PromptInput}", promptType, formattedInput);
+            _logger.LogInformation("AI {PromptType} ({PromptVersion}) input payload: {PromptInput}", promptType, SelectedPromptVersion, formattedInput);
             await WritePromptLogFileAsync(promptType, "INPUT", formattedInput);
         }
 
         private async Task LogPromptOutputAsync(string promptType, string output)
         {
             var formattedOutput = FormatPromptOutputForLog(output);
-            _logger.LogInformation("AI {PromptType} model output payload: {ModelOutput}", promptType, formattedOutput);
+            _logger.LogInformation("AI {PromptType} ({PromptVersion}) model output payload: {ModelOutput}", promptType, SelectedPromptVersion, formattedOutput);
             await WritePromptLogFileAsync(promptType, "OUTPUT", formattedOutput);
         }
 
@@ -829,5 +745,261 @@ private static int FindFirstJsonTokenIndex(string value)
 
             return arrayStart;
         }
+
+        private static string ResolvePromptVersion(string? version)
+        {
+            if (!string.IsNullOrWhiteSpace(version) &&
+                PromptProfiles.TryGetValue(version.Trim(), out var selectedVersion))
+            {
+                return selectedVersion;
+            }
+
+            return PromptVersionV1;
+        }
+
+        private static string BuildAnalysisSystemPrompt(string version)
+        {
+            return GetRequiredPromptTemplate(version, AnalysisSystemTemplateName);
+        }
+
+        private static string BuildAnalysisUserPrompt(
+            string version,
+            string schema,
+            string data,
+            string attachments)
+        {
+            var replacements = new Dictionary<string, string>
+            {
+                ["SCHEMA"] = schema,
+                ["DATA"] = data,
+                ["ATTACHMENTS"] = attachments
+            };
+
+            return RenderPromptTemplate(version, AnalysisUserTemplateName, replacements);
+        }
+
+        private static string BuildAttachmentSystemPrompt(string version)
+        {
+            return GetRequiredPromptTemplate(version, AttachmentSystemTemplateName);
+        }
+
+        private static string BuildAttachmentUserPrompt(string version, string attachment)
+        {
+            return RenderPromptTemplate(version, AttachmentUserTemplateName, new Dictionary<string, string>
+            {
+                ["ATTACHMENT"] = attachment
+            });
+        }
+
+        private static string BuildScoresheetSectionSystemPrompt(string version)
+        {
+            return GetRequiredPromptTemplate(version, ScoresheetSystemTemplateName);
+        }
+
+        private static string BuildScoresheetSectionUserPrompt(
+            string version,
+            string data,
+            string attachments,
+            string section,
+            string response)
+        {
+            return RenderPromptTemplate(version, ScoresheetUserTemplateName, new Dictionary<string, string>
+            {
+                ["DATA"] = data,
+                ["ATTACHMENTS"] = attachments,
+                ["SECTION"] = section,
+                ["RESPONSE"] = response
+            });
+        }
+
+        private static bool TryGetPromptTemplate(string version, string templateName, out string template)
+        {
+            template = string.Empty;
+            var cacheKey = $"{version}/{templateName}";
+            if (PromptTemplateCache.TryGetValue(cacheKey, out var cachedTemplate))
+            {
+                template = cachedTemplate;
+                return true;
+            }
+
+            var path = Path.Combine(AppContext.BaseDirectory, PromptTemplatesFolder, version, $"{templateName}.txt");
+            if (!File.Exists(path))
+            {
+                return false;
+            }
+
+            var loaded = PromptTemplateCache.GetOrAdd(cacheKey, _ => File.ReadAllText(path));
+            if (string.IsNullOrWhiteSpace(loaded))
+            {
+                return false;
+            }
+
+            template = loaded;
+            return true;
+        }
+
+        private static string GetRequiredPromptTemplate(string version, string templateName)
+        {
+            if (TryGetPromptTemplate(version, templateName, out var template))
+            {
+                return template;
+            }
+
+            throw new InvalidOperationException(
+                $"Missing required prompt template '{templateName}.txt' for prompt version '{version}'.");
+        }
+
+        private static string RenderPromptTemplate(
+            string version,
+            string templateName,
+            IReadOnlyDictionary<string, string> runtimeReplacements)
+        {
+            return RenderPromptTemplateInternal(
+                version,
+                templateName,
+                runtimeReplacements,
+                new HashSet<string>(StringComparer.OrdinalIgnoreCase));
+        }
+
+        private static string RenderPromptTemplateInternal(
+            string version,
+            string templateName,
+            IReadOnlyDictionary<string, string> runtimeReplacements,
+            ISet<string> resolutionStack)
+        {
+            if (!resolutionStack.Add(templateName))
+            {
+                throw new InvalidOperationException(
+                    $"Detected cyclic prompt fragment reference while resolving '{templateName}.txt' for prompt version '{version}'.");
+            }
+
+            var template = GetRequiredPromptTemplate(version, templateName);
+            var replacements = new Dictionary<string, string>(runtimeReplacements, StringComparer.Ordinal);
+            var baseTemplateName = GetTemplateBaseName(templateName);
+
+            foreach (var placeholder in GetTemplatePlaceholders(template))
+            {
+                if (replacements.ContainsKey(placeholder))
+                {
+                    continue;
+                }
+
+                var fragmentTemplateName = ResolveFragmentTemplateName(version, baseTemplateName, placeholder);
+                if (!string.IsNullOrWhiteSpace(fragmentTemplateName))
+                {
+                    replacements[placeholder] = RenderPromptTemplateInternal(
+                        version,
+                        fragmentTemplateName,
+                        new Dictionary<string, string>(StringComparer.Ordinal),
+                        resolutionStack);
+                }
+            }
+
+            var rendered = template;
+            foreach (var replacement in replacements)
+            {
+                rendered = rendered.Replace($"{{{{{replacement.Key}}}}}", replacement.Value ?? string.Empty, StringComparison.Ordinal);
+            }
+
+            var unresolved = GetTemplatePlaceholders(rendered);
+            if (unresolved.Count > 0)
+            {
+                throw new InvalidOperationException(
+                    $"Unresolved prompt placeholders in '{templateName}.txt' for prompt version '{version}': {string.Join(", ", unresolved.OrderBy(item => item))}");
+            }
+
+            resolutionStack.Remove(templateName);
+            return rendered;
+        }
+
+        private static string? ResolveFragmentTemplateName(string version, string baseTemplateName, string placeholderName)
+        {
+            var normalizedPlaceholder = placeholderName.ToLowerInvariant();
+            var baseScopedCandidate = $"{baseTemplateName}.{normalizedPlaceholder}";
+            if (TryGetPromptTemplate(version, baseScopedCandidate, out _))
+            {
+                return baseScopedCandidate;
+            }
+
+            if (TryResolveCommonTemplateName(placeholderName, out var commonTemplateName) &&
+                TryGetPromptTemplate(version, commonTemplateName, out _))
+            {
+                return commonTemplateName;
+            }
+
+            return null;
+        }
+
+        private static bool TryResolveCommonTemplateName(string placeholderName, out string commonTemplateName)
+        {
+            commonTemplateName = string.Empty;
+            if (!placeholderName.StartsWith("COMMON_", StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            var suffix = placeholderName.Substring("COMMON_".Length).ToLowerInvariant();
+            suffix = suffix.Replace('_', '.');
+            commonTemplateName = $"common.{suffix}";
+            return true;
+        }
+
+        private static string GetTemplateBaseName(string templateName)
+        {
+            var separatorIndex = templateName.IndexOf('.', StringComparison.Ordinal);
+            if (separatorIndex <= 0)
+            {
+                return templateName;
+            }
+
+            return templateName.Substring(0, separatorIndex);
+        }
+
+        private static HashSet<string> GetTemplatePlaceholders(string template)
+        {
+            var placeholders = new HashSet<string>(StringComparer.Ordinal);
+            var searchIndex = 0;
+
+            while (searchIndex < template.Length)
+            {
+                var start = template.IndexOf("{{", searchIndex, StringComparison.Ordinal);
+                if (start < 0)
+                {
+                    break;
+                }
+
+                var end = template.IndexOf("}}", start + 2, StringComparison.Ordinal);
+                if (end < 0)
+                {
+                    break;
+                }
+
+                var placeholder = template.Substring(start + 2, end - start - 2).Trim();
+                if (!string.IsNullOrWhiteSpace(placeholder))
+                {
+                    placeholders.Add(placeholder);
+                }
+
+                searchIndex = end + 2;
+            }
+
+            return placeholders;
+        }
+
+        private static string ExtractSummaryFromJson(string output)
+        {
+            if (!TryParseJsonObjectFromResponse(output, out var jsonObject))
+            {
+                return output?.Trim() ?? string.Empty;
+            }
+
+            if (jsonObject.TryGetProperty(AIJsonKeys.Summary, out var summaryProp) &&
+                summaryProp.ValueKind == JsonValueKind.String)
+            {
+                return summaryProp.GetString() ?? string.Empty;
+            }
+
+            return output?.Trim() ?? string.Empty;
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AnalysisPrompts.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AnalysisPrompts.cs
deleted file mode 100644
index 2e54412806..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AnalysisPrompts.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-namespace Unity.GrantManager.AI
-{
-    internal static class AnalysisPrompts
-    {
-        public const string DefaultRubric = @"BC GOVERNMENT GRANT EVALUATION RUBRIC:
-
-1. ELIGIBILITY REQUIREMENTS:
-   - Project must align with program objectives
-   - Applicant must be eligible entity type
-   - Budget must be reasonable and well-justified
-   - Project timeline must be realistic
-
-2. COMPLETENESS CHECKS:
-   - All required fields completed
-   - Necessary supporting documents provided
-   - Budget breakdown detailed and accurate
-   - Project description clear and comprehensive
-
-3. FINANCIAL REVIEW:
-   - Requested amount is within program limits
-   - Budget is reasonable for scope of work
-   - Matching funds or in-kind contributions identified
-   - Cost per outcome/beneficiary is reasonable
-
-4. RISK ASSESSMENT:
-   - Applicant capacity to deliver project
-   - Technical feasibility of proposed work
-   - Environmental or regulatory compliance
-   - Potential for cost overruns or delays
-
-5. QUALITY INDICATORS:
-   - Clear project objectives and outcomes
-   - Well-defined target audience/beneficiaries
-   - Appropriate project methodology
-   - Sustainability plan for long-term impact
-
-EVALUATION CRITERIA:
-- HIGH: Meets all requirements, well-prepared application, low risk
-- MEDIUM: Meets most requirements, minor issues or missing elements
-- LOW: Missing key requirements, significant concerns, high risk";
-
-        public const string ScoreRules = @"HIGH: Application demonstrates strong evidence across most rubric areas with few or no issues.
-MEDIUM: Application has some gaps or weaknesses that require reviewer attention.
-LOW: Application has significant gaps or risks across key rubric areas.";
-
-        public const string SeverityRules = @"ERROR: Issue that would likely prevent the application from being approved.
-WARNING: Issue that could negatively affect the application's approval.
-RECOMMENDATION: Reviewer-facing improvement or follow-up consideration.";
-
-        public const string OutputTemplate = @"{
-  ""rating"": ""HIGH/MEDIUM/LOW"",
-  ""warnings"": [
-    {
-      ""title"": ""Brief summary of the warning"",
-      ""detail"": ""Detailed warning message with full context and explanation""
-    }
-  ],
-  ""errors"": [
-    {
-      ""title"": ""Brief summary of the error"",
-      ""detail"": ""Detailed error message with full context and explanation""
-    }
-  ],
-  ""summaries"": [
-    {
-      ""title"": ""Brief summary of the recommendation"",
-      ""detail"": ""Detailed recommendation with specific actionable guidance""
-    }
-  ],
-  ""dismissed"": []
-}";
-
-        public const string Rules = @"- Use only SCHEMA, DATA, ATTACHMENTS, and RUBRIC as evidence.
-- Do not invent fields, documents, requirements, or facts.
-- Treat missing or empty values as findings only when they weaken rubric evidence.
-- Prefer material issues; avoid nitpicking.
-- Each error/warning/recommendation must describe one concrete issue or consideration and why it matters.
-- Use 3-6 words for title.
-- Each detail must be 1-2 complete sentences.
-- Each detail must be grounded in concrete evidence from provided inputs.
-- If attachment evidence is used, reference the attachment explicitly in detail.
-- Do not provide applicant-facing advice.
-- Do not mention rubric section names in findings.
-- If no findings exist, return empty arrays.
-- rating must be HIGH, MEDIUM, or LOW."
-            + "\n" + PromptCoreRules.ExactOutputShape
-            + "\n" + PromptCoreRules.NoExtraOutputKeys
-            + "\n" + PromptCoreRules.ValidJsonOnly
-            + "\n" + PromptCoreRules.PlainJsonOnly;
-
-        public static readonly string SystemPrompt = PromptHeader.Build(
-            "You are an expert grant analyst assistant for human reviewers.",
-            "Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SEVERITY, SCORE, OUTPUT, and RULES, return review findings.");
-
-        public static string BuildUserPrompt(
-            string schemaJson,
-            string dataJson,
-            string attachmentsJson,
-            string rubric)
-        {
-            return $@"SCHEMA
-{schemaJson}
-
-DATA
-{dataJson}
-
-ATTACHMENTS
-{attachmentsJson}
-
-RUBRIC
-{rubric}
-
-SEVERITY
-{SeverityRules}
-
-SCORE
-{ScoreRules}
-
-OUTPUT
-{OutputTemplate}
-
-RULES
-{Rules}";
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AttachmentPrompts.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AttachmentPrompts.cs
deleted file mode 100644
index 969480ea86..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AttachmentPrompts.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace Unity.GrantManager.AI
-{
-    internal static class AttachmentPrompts
-    {
-        public static readonly string SystemPrompt = PromptHeader.Build(
-            "You are a professional grant analyst for the BC Government.",
-            "Produce a concise reviewer-facing summary of the provided attachment context.");
-
-        public const string OutputSection = @"OUTPUT
-- Plain text only
-- 1-2 complete sentences";
-
-        public const string RulesSection = @"RULES
-- Use only the provided attachment context as evidence.
-- If text content is present, summarize the actual content.
-- If text content is missing or empty, provide a conservative metadata-based summary.
-- Do not invent missing details.
-- Keep the summary specific, concrete, and reviewer-facing.
-- Return plain text only (no markdown, bullets, or JSON).";
-
-        public static string BuildUserPrompt(string attachmentPayloadJson)
-        {
-            return $@"ATTACHMENT
-{attachmentPayloadJson}";
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptCoreRules.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptCoreRules.cs
deleted file mode 100644
index e11dce3c97..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptCoreRules.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Unity.GrantManager.AI
-{
-    internal static class PromptCoreRules
-    {
-        public const string UseProvidedEvidence = "- Use only provided input sections as evidence.";
-        public const string NoInvention = "- Do not invent missing details.";
-        public const string MinimumNarrativeWords = "- Any narrative text response must be at least 12 words.";
-        public const string ExactOutputShape = "- Return values exactly as specified in OUTPUT.";
-        public const string NoExtraOutputKeys = "- Do not return keys outside OUTPUT.";
-        public const string ValidJsonOnly = "- Return valid JSON only.";
-        public const string PlainJsonOnly = "- Return plain JSON only (no markdown).";
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptHeader.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptHeader.cs
deleted file mode 100644
index 701a43e740..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptHeader.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Unity.GrantManager.AI
-{
-    internal static class PromptHeader
-    {
-        public static string Build(string role, string task)
-        {
-            return $@"ROLE
-{role}
-
-TASK
-{task}";
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/ScoresheetPrompts.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/ScoresheetPrompts.cs
deleted file mode 100644
index 2db4de742d..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/ScoresheetPrompts.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-namespace Unity.GrantManager.AI
-{
-    internal static class ScoresheetPrompts
-    {
-        public static readonly string SectionSystemPrompt = PromptHeader.Build(
-            "You are an expert grant application reviewer for the BC Government.",
-            "Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES, answer only the questions in SECTION.");
-
-        public const string SectionOutputTemplate = @"{
-  ""<question_id>"": {
-    ""answer"": ""<string | number>"",
-    ""rationale"": ""<evidence-based rationale>"",
-    ""confidence"": <integer 0-100 step 5>
-  }
-}";
-
-        public const string SectionRules = "- Use only DATA and ATTACHMENTS as evidence.\n"
-            + "- Do not invent missing application details.\n"
-            + @"- Return exactly one answer object per question ID in SECTION.questions.
-- Do not omit any question IDs from SECTION.questions.
-- Do not add keys that are not question IDs from SECTION.questions.
-- Use RESPONSE as the output contract and fill every placeholder value.
-- Follow this process in order: (1) copy RESPONSE, (2) iterate SECTION.questions in order, (3) fill answer+rationale+confidence for each matching question ID, (4) run final completeness check.
-- Each answer object must include: ""answer"", ""rationale"", and ""confidence"".
-- Never omit ""answer"", ""rationale"", or ""confidence"" for any question type.
-- The ""answer"" value type must match question type: Number => numeric; YesNo/SelectList/Text/TextArea => string.
-- The ""rationale"" field must be 1-2 complete sentences and grounded in concrete DATA/ATTACHMENTS evidence.
-- In ""rationale"", cite concrete source evidence from the provided input content; do not cite prompt section headers.
-- For every question, rationale must justify both the selected answer and the selected confidence level based on evidence strength.
-- If explicit evidence is insufficient, choose the most conservative valid answer and state uncertainty in rationale.
-- Do not treat missing or non-contradictory information as evidence.
-- The ""confidence"" field must be an integer from 0 to 100 in increments of 5 and represents confidence in the selected answer.
-- Set confidence by certainty of the selected answer based on available evidence, regardless of which option is selected.
-- For yes/no questions, the ""answer"" field must be exactly ""Yes"" or ""No"".
-- For numeric questions, answer must be a numeric value within the allowed range.
-- For numeric questions, answer must never be blank.
-- If evidence is insufficient for a numeric question, return the minimum allowed numeric value and explain uncertainty in rationale.
-- If a required value is explicitly missing in DATA/ATTACHMENTS, set confidence high (80-100) when selecting the conservative minimum.
-- For select list questions, return only the selected options.number as a string (the option index shown in options), never label text or points.
-- For select list questions, the ""answer"" value must be one of question.allowed_answers exactly.
-- Never return 0 for select list answers unless 0 exists as an explicit option number.
-- For text and text area questions, answer must be concise, evidence-based, non-empty, and avoid boilerplate placeholders.
-- For text and text area questions, answer is the reviewer comment, and rationale must explain the evidence basis and certainty for that comment.
-- For comment fields, summarize key evidence-based conclusions from the other questions in SECTION, including uncertainty where applicable.
-- Do not leave rationale empty when answer is populated.
-- Final self-check before responding: every question ID in RESPONSE must have a non-empty ""answer"", non-empty ""rationale"", and ""confidence"".
-- If any answer object is incomplete, regenerate the full JSON response before returning it.
-"
-            + PromptCoreRules.MinimumNarrativeWords + "\n"
-            + PromptCoreRules.ExactOutputShape + "\n"
-            + PromptCoreRules.NoExtraOutputKeys + "\n"
-            + PromptCoreRules.ValidJsonOnly + "\n"
-            + PromptCoreRules.PlainJsonOnly;
-
-        public static string BuildSectionUserPrompt(
-            string applicationContent,
-            string attachmentSummariesText,
-            string sectionPayloadJson,
-            string responseTemplateJson)
-        {
-            return $@"DATA
-{applicationContent}
-
-ATTACHMENTS
-- {attachmentSummariesText}
-
-SECTION
-{sectionPayloadJson}
-
-RESPONSE
-{responseTemplateJson}
-
-OUTPUT
-{SectionOutputTemplate}
-
-RULES
-{SectionRules}";
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
new file mode 100644
index 0000000000..cc8d06ef5f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
@@ -0,0 +1,54 @@
+# Runtime Prompt Templates
+
+These files are the source of truth for runtime prompts.
+`OpenAIService` resolves templates from:
+
+- `AI/Prompts/Versions/<version>/<template>.txt`
+
+Current templates:
+
+- `analysis.system.txt`
+- `analysis.user.txt`
+- `analysis.rubric.txt` (optional, when `{{RUBRIC}}` is used)
+- `analysis.score.txt` (optional, when `{{SCORE}}` is used)
+- `analysis.output.txt` (optional, when `{{OUTPUT}}` is used)
+- `analysis.rules.txt` (optional, when `{{RULES}}` is used)
+- `common.*.txt` (optional shared fragments for `{{COMMON_*}}` placeholders)
+- `attachment.system.txt`
+- `attachment.user.txt`
+- `attachment.output.txt` (optional, when `{{OUTPUT}}` is used)
+- `attachment.rules.txt` (optional, when `{{RULES}}` is used)
+- `scoresheet.system.txt`
+- `scoresheet.user.txt`
+- `scoresheet.output.txt` (optional, when `{{OUTPUT}}` is used)
+- `scoresheet.rules.txt` (optional, when `{{RULES}}` is used)
+
+Placeholders:
+
+- `{{SCHEMA}}`
+- `{{DATA}}`
+- `{{ATTACHMENTS}}`
+- `{{RUBRIC}}`
+- `{{SCORE}}`
+- `{{OUTPUT}}`
+- `{{RULES}}`
+- `{{ATTACHMENT}}`
+- `{{DATA}}`
+- `{{ATTACHMENTS}}`
+- `{{SECTION}}`
+- `{{RESPONSE}}`
+
+Version selection:
+
+- `Azure:OpenAI:PromptVersion = v0|v1`
+- Unknown or missing version defaults to `v1`.
+
+Template loading is strict:
+
+- Core templates are required for each version.
+- Missing required templates fail fast at runtime with a configuration error.
+- Fragment templates are required when the corresponding placeholder is present in the parent template.
+- Fragment resolution is automatic using `<base>.<placeholder-lower>.txt` from the same version folder.
+  - Example: `analysis.user.txt` with `{{RULES}}` resolves `analysis.rules.txt`.
+- `{{COMMON_*}}` placeholders resolve to `common.<suffix>.txt` where suffix is lower-cased and `_` becomes `.`.
+  - Example: `{{COMMON_RULES}}` resolves `common.rules.txt`.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.system.txt
new file mode 100644
index 0000000000..f7d3be3bb3
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.system.txt
@@ -0,0 +1,12 @@
+You are an expert grant application reviewer for the BC Government.
+
+Conduct a thorough, comprehensive analysis across all rubric areas. Identify substantive issues, concerns, and opportunities for improvement.
+
+Classify findings by their effect on the application's quality and fundability:
+- ERRORS: important missing information, significant gaps, compliance issues, or major concerns affecting eligibility
+- WARNINGS: areas needing clarification, moderate issues, or concerns that should be addressed
+- SUMMARIES: concise reviewer-facing recommendations or follow-up considerations
+
+Evaluate content quality, clarity, and appropriateness. Be thorough but fair and avoid nitpicking.
+
+Respond only with valid JSON in the exact format requested.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.user.txt
new file mode 100644
index 0000000000..67a6fde997
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.user.txt
@@ -0,0 +1,98 @@
+APPLICATION CONTENT:
+{{DATA}}
+
+ATTACHMENT SUMMARIES:
+{{ATTACHMENTS}}
+
+FORM FIELD CONFIGURATION:
+{{SCHEMA}}
+
+MANDATORY FIELDS:
+- Determine mandatory fields from FORM FIELD CONFIGURATION.
+- Report missing mandatory fields as findings when they materially affect review quality.
+
+OPTIONAL FIELDS (may be left blank):
+- Determine optional fields from FORM FIELD CONFIGURATION.
+- Do not flag optional fields when blank unless they materially weaken rubric evidence.
+
+EVALUATION RUBRIC:
+BC GOVERNMENT GRANT EVALUATION RUBRIC:
+
+1. ELIGIBILITY REQUIREMENTS:
+   - Project must align with program objectives
+   - Applicant must be eligible entity type
+   - Budget must be reasonable and well-justified
+   - Project timeline must be realistic
+
+2. COMPLETENESS CHECKS:
+   - All required fields completed
+   - Necessary supporting documents provided
+   - Budget breakdown detailed and accurate
+   - Project description clear and comprehensive
+
+3. FINANCIAL REVIEW:
+   - Requested amount is within program limits
+   - Budget is reasonable for scope of work
+   - Matching funds or in-kind contributions identified
+   - Cost per outcome/beneficiary is reasonable
+
+4. RISK ASSESSMENT:
+   - Applicant capacity to deliver project
+   - Technical feasibility of proposed work
+   - Environmental or regulatory compliance
+   - Potential for cost overruns or delays
+
+5. QUALITY INDICATORS:
+   - Clear project objectives and outcomes
+   - Well-defined target audience/beneficiaries
+   - Appropriate project methodology
+   - Sustainability plan for long-term impact
+
+EVALUATION CRITERIA:
+- HIGH: Meets all requirements, well-prepared application, low risk
+- MEDIUM: Meets most requirements, minor issues or missing elements
+- LOW: Missing key requirements, significant concerns, high risk
+
+Analyze this grant application comprehensively across all five rubric categories (Eligibility, Completeness, Financial Review, Risk Assessment, and Quality Indicators). Identify issues, concerns, and areas for improvement.
+
+OUTPUT
+{
+  "rating": "<HIGH|MEDIUM|LOW>",
+  "warnings": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "errors": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "summaries": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "nextSteps": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "recommendation": {
+    "decision": "<PROCEED|HOLD>",
+    "rationale": "<string>"
+  }
+}
+
+Important:
+- Use only APPLICATION CONTENT, ATTACHMENT SUMMARIES, FORM FIELD CONFIGURATION, and EVALUATION RUBRIC as evidence.
+- Use summaries for overall application quality/readiness synthesis.
+- Use nextSteps for reviewer-facing follow-up actions or considerations before scoring or decision-making.
+- recommendation.decision must be PROCEED or HOLD.
+- recommendation.rationale must explain the high-level recommendation in 1-2 complete sentences using provided evidence.
+- Use "title" and "detail" keys for all finding objects.
+- Return valid plain JSON only in the exact OUTPUT shape.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.system.txt
new file mode 100644
index 0000000000..6e2775e346
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.system.txt
@@ -0,0 +1,10 @@
+You are a professional grant analyst for the BC Government.
+
+Please analyze this attachment and provide a concise reviewer-facing summary of its content, purpose, and key information.
+
+OUTPUT
+{
+  "summary": "<string>"
+}
+
+Use only ATTACHMENT as evidence. If ATTACHMENT.text is present, summarize actual content; otherwise provide a conservative file-level summary. Write 1-2 complete sentences and return valid plain JSON only in the exact OUTPUT shape.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.user.txt
new file mode 100644
index 0000000000..500fc5ec7a
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.user.txt
@@ -0,0 +1,2 @@
+ATTACHMENT
+{{ATTACHMENT}}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.system.txt
new file mode 100644
index 0000000000..0a629a6a97
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.system.txt
@@ -0,0 +1,5 @@
+You are an expert grant application reviewer for the BC Government.
+Analyze the provided application and answer only the questions in the specified scoresheet section.
+Be thorough, objective, and fair. Base answers strictly on provided evidence.
+Always provide evidence-grounded rationale and an honest confidence score.
+Respond only with valid JSON in the exact format requested.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.user.txt
new file mode 100644
index 0000000000..6230fe0ea3
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.user.txt
@@ -0,0 +1,38 @@
+APPLICATION CONTENT:
+{{DATA}}
+
+ATTACHMENT SUMMARIES:
+{{ATTACHMENTS}}
+
+SCORESHEET SECTION:
+{{SECTION}}
+
+RESPONSE TEMPLATE:
+{{RESPONSE}}
+
+Please analyze this grant application and provide answers for each question in the specified section only.
+
+For each question, provide:
+1. The answer based on the application evidence
+2. A brief rationale (1-2 complete sentences) citing concrete supporting evidence
+3. A confidence score from 0-100 (integer) indicating certainty in the selected answer
+
+OUTPUT
+{
+  "<question_id>": {
+    "answer": "<string | number>",
+    "rationale": "<evidence-based rationale>",
+    "confidence": <integer 0-100 step 5>
+  }
+}
+
+Important:
+- Use only APPLICATION CONTENT and ATTACHMENT SUMMARIES as evidence.
+- Answer only the question IDs in the specified section.
+- Every question must include answer, rationale, and confidence.
+- Use RESPONSE TEMPLATE as the contract and fill every placeholder value.
+- answer type must match the question type.
+- For select list questions, return only the option number as a string, never label text.
+- rationale must be 1-2 complete sentences grounded in evidence.
+- confidence must be an integer from 0 to 100 in increments of 5.
+- Return valid plain JSON only in the exact OUTPUT shape.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.output.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.output.txt
new file mode 100644
index 0000000000..a80671676b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.output.txt
@@ -0,0 +1,31 @@
+{
+  "rating": "<HIGH|MEDIUM|LOW>",
+  "errors": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "warnings": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "summaries": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "nextSteps": [
+    {
+      "title": "<string>",
+      "detail": "<string>"
+    }
+  ],
+  "recommendation": {
+    "decision": "<PROCEED|HOLD>",
+    "rationale": "<string>"
+  }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rubric.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rubric.txt
new file mode 100644
index 0000000000..71ef4cb126
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rubric.txt
@@ -0,0 +1,5 @@
+ELIGIBILITY REQUIREMENTS: Project aligns with program objectives; Applicant is an eligible entity; Budget is reasonable and justified; Timeline is realistic.
+COMPLETENESS CHECKS: Required information is present; Supporting materials are provided where applicable; Description is clear.
+FINANCIAL REVIEW: Requested amount is within limits; Budget matches scope; Matching funds or contributions are identified.
+RISK ASSESSMENT: Applicant capacity; Feasibility; Compliance considerations; Delivery risks.
+QUALITY INDICATORS: Clear objectives; Defined beneficiaries; Appropriate approach; Long-term sustainability.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rules.txt
new file mode 100644
index 0000000000..124a84a4e2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rules.txt
@@ -0,0 +1,14 @@
+- Use only provided input sections as evidence.
+- Do not invent fields, documents, requirements, or facts.
+- Treat missing or empty values as findings only when they weaken rubric evidence.
+- Prefer material issues; avoid nitpicking.
+- Use 3-6 words for title.
+- Each detail must be 1-2 complete sentences.
+- Each detail must cite concrete evidence from DATA or ATTACHMENTS.
+- If ATTACHMENTS evidence is used, cite the attachment by name in detail.
+- If no findings exist, return empty arrays.
+- Rating must be HIGH, MEDIUM, or LOW.
+- Use summaries for overall application quality/readiness synthesis.
+- Use nextSteps for reviewer-facing follow-up actions or considerations before scoring or decision-making.
+- recommendation.decision must be PROCEED or HOLD.
+- recommendation.rationale must explain the high-level recommendation in 1-2 complete sentences using provided evidence.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.score.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.score.txt
new file mode 100644
index 0000000000..0ce56f3e81
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.score.txt
@@ -0,0 +1,3 @@
+HIGH: Application demonstrates strong evidence across most rubric areas with few or no issues.
+MEDIUM: Application has some gaps or weaknesses that require reviewer attention.
+LOW: Application has significant gaps or risks across key rubric areas.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.system.txt
new file mode 100644
index 0000000000..26953aa2f3
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.system.txt
@@ -0,0 +1,5 @@
+ROLE
+You are an expert grant analyst assistant for human reviewers.
+
+TASK
+Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES, return review findings.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.user.txt
new file mode 100644
index 0000000000..3b62f3cd97
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.user.txt
@@ -0,0 +1,21 @@
+SCHEMA
+{{SCHEMA}}
+
+DATA
+{{DATA}}
+
+ATTACHMENTS
+{{ATTACHMENTS}}
+
+RUBRIC
+{{RUBRIC}}
+
+SCORE
+{{SCORE}}
+
+OUTPUT
+{{OUTPUT}}
+
+RULES
+{{RULES}}
+{{COMMON_RULES}}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.output.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.output.txt
new file mode 100644
index 0000000000..b9d5a880a0
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.output.txt
@@ -0,0 +1,3 @@
+{
+  "summary": "<string>"
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.rules.txt
new file mode 100644
index 0000000000..63427ac0e5
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.rules.txt
@@ -0,0 +1,7 @@
+- Use only ATTACHMENT as evidence.
+- If ATTACHMENT.text is present, summarize actual content.
+- If ATTACHMENT.text is null or empty, provide a conservative file-level summary.
+- Do not invent missing details.
+- Write 1-2 complete sentences.
+- Summary must be grounded in concrete ATTACHMENT evidence.
+- Return exactly one object with only the key: summary.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.system.txt
new file mode 100644
index 0000000000..cb59d46c27
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.system.txt
@@ -0,0 +1,5 @@
+ROLE
+You are a professional grant analyst for the BC Government.
+
+TASK
+Produce a concise reviewer-facing summary of the provided attachment context.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.user.txt
new file mode 100644
index 0000000000..3247815c7b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.user.txt
@@ -0,0 +1,9 @@
+ATTACHMENT
+{{ATTACHMENT}}
+
+OUTPUT
+{{OUTPUT}}
+
+RULES
+{{RULES}}
+{{COMMON_RULES}}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/common.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/common.rules.txt
new file mode 100644
index 0000000000..ada24e7e87
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/common.rules.txt
@@ -0,0 +1,5 @@
+- Any narrative text response must be at least 12 words.
+- Return values exactly as specified in OUTPUT.
+- Do not return keys outside OUTPUT.
+- Return valid JSON only.
+- Return plain JSON only (no markdown).
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.output.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.output.txt
new file mode 100644
index 0000000000..8af7a3f2fd
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.output.txt
@@ -0,0 +1,7 @@
+{
+  "<question_id>": {
+    "answer": "<string | number>",
+    "rationale": "<evidence-based rationale>",
+    "confidence": <integer 0-100 step 5>
+  }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.rules.txt
new file mode 100644
index 0000000000..41c8d580f4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.rules.txt
@@ -0,0 +1,31 @@
+- Use only DATA and ATTACHMENTS as evidence.
+- Do not invent missing application details.
+- Return exactly one answer object per question ID in SECTION.questions.
+- Do not omit any question IDs from SECTION.questions.
+- Do not add keys that are not question IDs from SECTION.questions.
+- Use RESPONSE as the output contract and fill every placeholder value.
+- Follow this process in order: (1) copy RESPONSE, (2) iterate SECTION.questions in order, (3) fill answer+rationale+confidence for each matching question ID, (4) run final completeness check.
+- Each answer object must include: "answer", "rationale", and "confidence".
+- Never omit "answer", "rationale", or "confidence" for any question type.
+- The "answer" value type must match question type: Number => numeric; YesNo/SelectList/Text/TextArea => string.
+- The "rationale" field must be 1-2 complete sentences and grounded in concrete DATA/ATTACHMENTS evidence.
+- In "rationale", cite concrete source evidence from the provided input content; do not cite prompt section headers.
+- For every question, rationale must justify both the selected answer and the selected confidence level based on evidence strength.
+- If explicit evidence is insufficient, choose the most conservative valid answer and state uncertainty in rationale.
+- Do not treat missing or non-contradictory information as evidence.
+- The "confidence" field must be an integer from 0 to 100 in increments of 5 and represents confidence in the selected answer.
+- Set confidence by certainty of the selected answer based on available evidence, regardless of which option is selected.
+- For yes/no questions, the "answer" field must be exactly "Yes" or "No".
+- For numeric questions, answer must be a numeric value within the allowed range.
+- For numeric questions, answer must never be blank.
+- If evidence is insufficient for a numeric question, return the minimum allowed numeric value and explain uncertainty in rationale.
+- If a required value is explicitly missing in DATA/ATTACHMENTS, set confidence high (80-100) when selecting the conservative minimum.
+- For select list questions, return only the selected options.number as a string (the option index shown in options), never label text or points.
+- For select list questions, the "answer" value must be one of question.allowed_answers exactly.
+- Never return 0 for select list answers unless 0 exists as an explicit option number.
+- For text and text area questions, answer must be concise, evidence-based, non-empty, and avoid boilerplate placeholders.
+- For text and text area questions, answer is the reviewer comment, and rationale must explain the evidence basis and certainty for that comment.
+- For comment fields, summarize key evidence-based conclusions from the other questions in SECTION, including uncertainty where applicable.
+- Do not leave rationale empty when answer is populated.
+- Final self-check before responding: every question ID in RESPONSE must have a non-empty "answer", non-empty "rationale", and "confidence".
+- If any answer object is incomplete, regenerate the full JSON response before returning it.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.system.txt
new file mode 100644
index 0000000000..3b180cb289
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.system.txt
@@ -0,0 +1,5 @@
+ROLE
+You are an expert grant application reviewer for the BC Government.
+
+TASK
+Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES, answer only the questions in SECTION.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.user.txt
new file mode 100644
index 0000000000..5b9d01b001
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.user.txt
@@ -0,0 +1,18 @@
+DATA
+{{DATA}}
+
+ATTACHMENTS
+{{ATTACHMENTS}}
+
+SECTION
+{{SECTION}}
+
+RESPONSE
+{{RESPONSE}}
+
+OUTPUT
+{{OUTPUT}}
+
+RULES
+{{RULES}}
+{{COMMON_RULES}}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/TextExtractionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/TextExtractionService.cs
index 9aad041a5e..54df521637 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/TextExtractionService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/TextExtractionService.cs
@@ -23,10 +23,22 @@ public partial class TextExtractionService : ITextExtractionService, ITransientD
         private const int MaxDocxTableRows = 2000;
         private const int MaxDocxTableCellsPerRow = 50;
         private readonly ILogger<TextExtractionService> _logger;
+        private readonly Dictionary<string, Func<string, byte[], string>> _extractorsByExtension;
 
         public TextExtractionService(ILogger<TextExtractionService> logger)
         {
             _logger = logger;
+            _extractorsByExtension = new Dictionary<string, Func<string, byte[], string>>(StringComparer.OrdinalIgnoreCase)
+            {
+                [".txt"] = (_, content) => ExtractTextFromTextFile(content),
+                [".csv"] = (_, content) => ExtractTextFromTextFile(content),
+                [".json"] = (_, content) => ExtractTextFromTextFile(content),
+                [".xml"] = (_, content) => ExtractTextFromTextFile(content),
+                [".pdf"] = ExtractTextFromPdfFile,
+                [".docx"] = ExtractTextFromWordDocx,
+                [".xls"] = ExtractTextFromExcelFile,
+                [".xlsx"] = ExtractTextFromExcelFile
+            };
         }
 
         public Task<string> ExtractTextAsync(string fileName, byte[] fileContent, string contentType)
@@ -42,46 +54,41 @@ public Task<string> ExtractTextAsync(string fileName, byte[] fileContent, string
                 var normalizedContentType = contentType?.ToLowerInvariant() ?? string.Empty;
                 var extension = Path.GetExtension(fileName)?.ToLowerInvariant() ?? string.Empty;
 
-                string rawText;
+                if (extension == ".doc")
+                {
+                    _logger.LogDebug("Legacy .doc extraction is not supported for {FileName}", fileName);
+                    return Task.FromResult(string.Empty);
+                }
+
+                if (_extractorsByExtension.TryGetValue(extension, out var extractor))
+                {
+                    var rawText = extractor(fileName, fileContent);
+                    return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
+                }
 
-                if (normalizedContentType.Contains("text/") ||
-                    extension == ".txt" ||
-                    extension == ".csv" ||
-                    extension == ".json" ||
-                    extension == ".xml")
+                if (normalizedContentType.Contains("text/"))
                 {
-                    rawText = ExtractTextFromTextFile(fileContent);
+                    var rawText = ExtractTextFromTextFile(fileContent);
                     return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
                 }
 
-                if (normalizedContentType.Contains("pdf") || extension == ".pdf")
+                if (normalizedContentType.Contains("pdf"))
                 {
-                    rawText = ExtractTextFromPdfFile(fileName, fileContent);
+                    var rawText = ExtractTextFromPdfFile(fileName, fileContent);
                     return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
                 }
 
                 if (normalizedContentType.Contains("word") ||
                     normalizedContentType.Contains("msword") ||
-                    normalizedContentType.Contains("officedocument.wordprocessingml") ||
-                    extension == ".doc" ||
-                    extension == ".docx")
+                    normalizedContentType.Contains("officedocument.wordprocessingml"))
                 {
-                    if (extension == ".docx" || normalizedContentType.Contains("officedocument.wordprocessingml"))
-                    {
-                        rawText = ExtractTextFromWordDocx(fileName, fileContent);
-                        return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
-                    }
-
-                    _logger.LogDebug("Legacy .doc extraction is not supported for {FileName}", fileName);
-                    return Task.FromResult(string.Empty);
+                    var rawText = ExtractTextFromWordDocx(fileName, fileContent);
+                    return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
                 }
 
-                if (normalizedContentType.Contains("excel") ||
-                    normalizedContentType.Contains("spreadsheet") ||
-                    extension == ".xls" ||
-                    extension == ".xlsx")
+                if (normalizedContentType.Contains("excel") || normalizedContentType.Contains("spreadsheet"))
                 {
-                    rawText = ExtractTextFromExcelFile(fileName, fileContent);
+                    var rawText = ExtractTextFromExcelFile(fileName, fileContent);
                     return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
                 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
index c5a2c26f3b..4cbc3f3ff4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Authorization;
-using Volo.Abp;
 using Microsoft.AspNetCore.Authorization.Infrastructure;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Unity.AI.Permissions;
 using Unity.Flex;
 using Unity.Flex.Scoresheets;
 using Unity.Flex.Scoresheets.Enums;
@@ -14,9 +14,9 @@
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Comments;
 using Unity.GrantManager.Exceptions;
-using Unity.GrantManager.Permissions;
 using Unity.GrantManager.Workflow;
 using Unity.Modules.Shared;
+using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
@@ -94,7 +94,7 @@ public async Task<AssessmentDisplayListDto> GetDisplayList(Guid applicationId)
 
             // If AI Scoring feature is disabled, or user doesn't have permissions to view AI assessments, filter out AI assessments from the list
             var aiScoringEnabled = await _featureChecker.IsEnabledAsync("Unity.AI.Scoring");
-            var canViewAI = await AuthorizationService.IsGrantedAsync(GrantApplicationPermissions.AI.ScoringAssistant.Default);
+            var canViewAI = await AuthorizationService.IsGrantedAsync(AIPermissions.ScoringAssistant.ScoringAssistantDefault);
             assessmentList = assessmentList
                 .Where(a => !a.IsAiAssessment || (aiScoringEnabled && canViewAI))
                 .OrderByDescending(a => a.IsAiAssessment)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
new file mode 100644
index 0000000000..8f7bb06130
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
@@ -0,0 +1,25 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.AI;
+using Volo.Abp;
+
+namespace Unity.GrantManager.GrantApplications;
+
+public class ApplicationAIAnalysisAppService(
+    IApplicationAnalysisService applicationAnalysisService)
+    : GrantManagerAppService, IApplicationAIAnalysisAppService
+{
+    public async Task<string> GenerateAIAnalysisAsync(Guid applicationId)
+    {
+        try
+        {
+            return await applicationAnalysisService.RegenerateAndSaveAsync(applicationId);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error regenerating AI analysis for application {ApplicationId}", applicationId);
+            throw new UserFriendlyException("Failed to regenerate AI analysis. Please try again.");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
new file mode 100644
index 0000000000..c777fd61f4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Permissions;
+using Unity.GrantManager.AI;
+using Volo.Abp;
+
+namespace Unity.GrantManager.GrantApplications;
+
+[Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
+public class ApplicationAIScoringAppService(
+    IApplicationScoresheetAnalysisService applicationScoresheetAnalysisService)
+    : GrantManagerAppService, IApplicationAIScoringAppService
+{
+    public async Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId)
+    {
+        try
+        {
+            return await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(applicationId);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error regenerating AI scoresheet answers for application {ApplicationId}", applicationId);
+            throw new UserFriendlyException("Failed to regenerate AI scoresheet answers. Please try again.");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
index 075d568663..e61690138a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -13,17 +13,17 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
-using Unity.Flex.WorksheetInstances;
-using Unity.Flex.Worksheets;
+using Unity.Flex.WorksheetInstances;
+using Unity.Flex.Worksheets;
 using Unity.GrantManager.Applicants;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.AI;
 using Unity.GrantManager.Events;
-using Unity.GrantManager.Flex;
-using Unity.GrantManager.Identity;
-using Unity.GrantManager.Payments;
-using Unity.Modules.Shared;
+using Unity.GrantManager.Flex;
+using Unity.GrantManager.Identity;
+using Unity.GrantManager.Payments;
+using Unity.Modules.Shared;
 using Unity.Modules.Shared.Correlation;
 using Unity.Payments.PaymentRequests;
 using Volo.Abp;
@@ -45,8 +45,8 @@ public class GrantApplicationAppService(
     IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
     IApplicantRepository applicantRepository,
     IApplicationFormRepository applicationFormRepository,
-    IApplicantAgentRepository applicantAgentRepository,
-    IApplicantAddressRepository applicantAddressRepository,
+    IApplicantAgentRepository applicantAgentRepository,
+    IApplicantAddressRepository applicantAddressRepository,
     IApplicantSupplierAppService applicantSupplierService,
     IPaymentRequestAppService paymentRequestService)
     : GrantManagerAppService, IGrantApplicationAppService
@@ -974,11 +974,11 @@ public async Task<ListResultDto<ApplicationActionDto>> GetActions(Guid applicati
 
         // NOTE: Authorization is applied on the AppService layer and is false by default
         // AUTHORIZATION HANDLING
-        actionDtos.ForEach(async item =>
-        {
-            item.IsPermitted = item.IsPermitted && (await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(item.ApplicationAction)));
-            item.IsAuthorized = true;
-        });
+        foreach (var item in actionDtos)
+        {
+            item.IsPermitted = item.IsPermitted && (await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(item.ApplicationAction)));
+            item.IsAuthorized = true;
+        }
 
         return new ListResultDto<ApplicationActionDto>(actionDtos);
     }
@@ -1054,21 +1054,21 @@ private static Dictionary<string, object> ExtractCustomFieldsForWorksheet(dynami
         return result;
     }
 
-    public async Task<string> DismissAIIssueAsync(Guid applicationId, string issueId)
+    public async Task<string> HideAIAnalysisItemAsync(Guid applicationId, string itemId)
     {
-        return await UpdateAIIssueDismissStateAsync(applicationId, issueId, isDismiss: true);
+        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: true);
     }
 
-    public async Task<string> RestoreAIIssueAsync(Guid applicationId, string issueId)
+    public async Task<string> ShowAIAnalysisItemAsync(Guid applicationId, string itemId)
     {
-        return await UpdateAIIssueDismissStateAsync(applicationId, issueId, isDismiss: false);
+        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: false);
     }
 
-    private async Task<string> UpdateAIIssueDismissStateAsync(Guid applicationId, string issueId, bool isDismiss)
+    private async Task<string> UpdateAIAnalysisItemVisibilityStateAsync(Guid applicationId, string itemId, bool isHidden)
     {
-        if (string.IsNullOrWhiteSpace(issueId))
+        if (string.IsNullOrWhiteSpace(itemId))
         {
-            throw new UserFriendlyException("AI issue id is required.");
+            throw new UserFriendlyException("AI analysis item id is required.");
         }
 
         var application = await applicationRepository.GetAsync(applicationId);
@@ -1080,76 +1080,63 @@ private async Task<string> UpdateAIIssueDismissStateAsync(Guid applicationId, st
 
         try
         {
-            var updatedAnalysis = ModifyDismissedItems(application.AIAnalysis, issueId, isDismiss);
+            var updatedAnalysis = SetAnalysisItemHiddenState(application.AIAnalysis, itemId, isHidden);
             application.AIAnalysis = updatedAnalysis;
             await applicationRepository.UpdateAsync(application);
             return updatedAnalysis;
         }
         catch (Exception ex)
         {
-            var action = isDismiss ? "dismissing" : "restoring";
-            var userMessage = isDismiss
-                ? "Failed to dismiss the AI issue. Please try again."
-                : "Failed to restore the AI issue. Please try again.";
+            var action = isHidden ? "hiding" : "showing";
+            var userMessage = isHidden
+                ? "Failed to hide the AI item. Please try again."
+                : "Failed to show the AI item. Please try again.";
 
-            Logger.LogError(ex, "Error {Action} AI issue {IssueId} for application {ApplicationId}", action, issueId, applicationId);
+            Logger.LogError(ex, "Error {Action} AI analysis item {ItemId} for application {ApplicationId}", action, itemId, applicationId);
             throw new UserFriendlyException(userMessage);
         }
     }
 
-    private static string ModifyDismissedItems(string analysisJson, string issueId, bool isDismiss)
+    private static string SetAnalysisItemHiddenState(string analysisJson, string itemId, bool isHidden)
     {
         if (string.IsNullOrWhiteSpace(analysisJson))
         {
             return analysisJson;
         }
 
-        JsonObject? root;
         try
         {
-            root = JsonNode.Parse(analysisJson) as JsonObject;
+            var analysis = System.Text.Json.JsonSerializer.Deserialize<ApplicationAnalysisResponse>(analysisJson, AiAnalysisReadOptions);
+            if (analysis == null)
+            {
+                return analysisJson;
+            }
+
+            UpdateFindingHiddenState(analysis.Errors, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.Warnings, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.Summaries, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.NextSteps, itemId, isHidden);
+
+            return System.Text.Json.JsonSerializer.Serialize(analysis, AiAnalysisWriteOptions);
         }
         catch (System.Text.Json.JsonException)
         {
             return analysisJson;
         }
+    }
 
-        if (root == null)
-        {
-            return analysisJson;
-        }
-
-        var dismissedItems = new List<string>();
-        var seen = new HashSet<string>(StringComparer.Ordinal);
-
-        if (root[AIJsonKeys.Dismissed] is JsonArray dismissedArray)
+    private static void UpdateFindingHiddenState(IEnumerable<ApplicationAnalysisFinding> findings, string itemId, bool isHidden)
+    {
+        foreach (var finding in findings)
         {
-            foreach (var item in dismissedArray)
+            if (!string.Equals(finding.Id, itemId, StringComparison.Ordinal))
             {
-                var id = item?.GetValue<string>();
-                if (string.IsNullOrWhiteSpace(id) || !seen.Add(id))
-                {
-                    continue;
-                }
-
-                dismissedItems.Add(id);
+                continue;
             }
-        }
 
-        if (isDismiss)
-        {
-            if (seen.Add(issueId))
-            {
-                dismissedItems.Add(issueId);
-            }
+            finding.Hidden = isHidden;
+            return;
         }
-        else
-        {
-            dismissedItems.RemoveAll(id => string.Equals(id, issueId, StringComparison.Ordinal));
-        }
-
-        root[AIJsonKeys.Dismissed] = new JsonArray(dismissedItems.Select(id => JsonValue.Create(id)).ToArray());
-        return root.ToJsonString(AiAnalysisWriteOptions);
     }
 
     private static ApplicationAnalysisResponse? ParseAiAnalysisData(string? analysisJson)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
index 8ab8bb0094..a4d07dd2aa 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
@@ -54,14 +54,21 @@ public class GenerateAIContentHandler : ILocalEventHandler<ApplicationProcessEve
             AIJsonKeys.Errors,
             AIJsonKeys.Warnings,
             AIJsonKeys.Summaries,
-            AIJsonKeys.Dismissed
+            AIJsonKeys.NextSteps,
+            AIJsonKeys.Recommendation
         };
         private static readonly string[] AllowedFindingProperties =
         {
             AIJsonKeys.Id,
+            AIJsonKeys.Hidden,
             AIJsonKeys.Title,
             AIJsonKeys.Detail
         };
+        private static readonly string[] AllowedRecommendationProperties =
+        {
+            AIJsonKeys.Decision,
+            AIJsonKeys.Rationale
+        };
         private static readonly string[] AllowedScoresheetAnswerProperties =
         {
             AIJsonKeys.Answer,
@@ -280,7 +287,7 @@ private async Task GenerateApplicationAnalysisAsync(Application application, Lis
                         application.Id);
                 }
 
-                var analysisData = BuildAnalysisDataPayload(application, formSubmission);
+                var analysisData = BuildPromptDataPayload(application, formSubmission);
                 _logger.LogInformation("Generating analysis for application {ApplicationId}", application.Id);
 
                 _logger.LogDebug("Generating AI analysis for application {ApplicationId} with {AttachmentCount} attachment summaries",
@@ -290,8 +297,7 @@ private async Task GenerateApplicationAnalysisAsync(Application application, Lis
                 {
                     Schema = formFieldSchema,
                     Data = analysisData,
-                    Attachments = analysisAttachments,
-                    Rubric = AnalysisPrompts.DefaultRubric
+                    Attachments = analysisAttachments
                 };
 
                 var analysis = await _aiService.GenerateApplicationAnalysisAsync(analysisRequest);
@@ -327,55 +333,7 @@ private static List<AIAttachmentItem> BuildAnalysisAttachments(List<ApplicationC
                 .ToList();
         }
 
-        private JsonElement BuildAnalysisDataPayload(Application application, ApplicationFormSubmission? formSubmission)
-        {
-            var fallbackPayload = BuildFallbackAnalysisDataPayload(application);
-
-            if (string.IsNullOrWhiteSpace(formSubmission?.Submission))
-            {
-                return JsonSerializer.SerializeToElement(fallbackPayload);
-            }
-
-            try
-            {
-                using var submissionDoc = JsonDocument.Parse(formSubmission.Submission);
-                var root = submissionDoc.RootElement;
-
-                JsonElement submissionData = root;
-                if (root.ValueKind == JsonValueKind.Object &&
-                    root.TryGetProperty("data", out var dataElement) &&
-                    dataElement.ValueKind == JsonValueKind.Object)
-                {
-                    submissionData = dataElement;
-                }
-                else if (root.ValueKind == JsonValueKind.Object &&
-                    root.TryGetProperty("submission", out var submissionElement) &&
-                    submissionElement.ValueKind == JsonValueKind.Object &&
-                    submissionElement.TryGetProperty("data", out var nestedDataElement) &&
-                    nestedDataElement.ValueKind == JsonValueKind.Object)
-                {
-                    submissionData = nestedDataElement;
-                }
-
-                if (submissionData.ValueKind != JsonValueKind.Object)
-                {
-                    return JsonSerializer.SerializeToElement(fallbackPayload);
-                }
-
-                var values = BuildPromptDataValues(submissionData);
-
-                return JsonSerializer.SerializeToElement(values);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex,
-                    "Failed to parse form submission JSON for application {ApplicationId}; falling back to curated analysis data.",
-                    application.Id);
-                return JsonSerializer.SerializeToElement(fallbackPayload);
-            }
-        }
-
-        private static object BuildFallbackAnalysisDataPayload(Application application)
+        private static object BuildFallbackPromptDataPayload(Application application)
         {
             var notSpecified = "Not specified";
             return new
@@ -442,7 +400,7 @@ private async Task GenerateScoresheetAnalysisAsync(Application application, List
                 var allSectionResults = new Dictionary<string, object>();
                 var scoresheetAttachments = BuildScoresheetAttachments(attachments);
                 var formSubmission = await _applicationFormSubmissionRepository.GetByApplicationAsync(application.Id);
-                var scoresheetData = BuildScoresheetDataPayload(application, formSubmission);
+                var scoresheetData = BuildPromptDataPayload(application, formSubmission);
                 LogFormSubmissionPreview(formSubmission?.RenderedHTML);
 
                 foreach (var section in scoresheet.Sections.OrderBy(s => s.Order))
@@ -485,49 +443,69 @@ private static List<AIAttachmentItem> BuildScoresheetAttachments(List<Applicatio
                 .ToList();
         }
 
-        private JsonElement BuildScoresheetDataPayload(Application application, ApplicationFormSubmission? formSubmission)
+        private JsonElement BuildPromptDataPayload(Application application, ApplicationFormSubmission? formSubmission)
         {
-            var fallbackContent = BuildScoresheetFallbackContent(application, formSubmission?.RenderedHTML);
+            var fallbackPayload = BuildFallbackPromptDataPayload(application);
+            if (TryBuildPromptDataValues(application.Id, formSubmission, out var values))
+            {
+                return JsonSerializer.SerializeToElement(values);
+            }
+
+            return JsonSerializer.SerializeToElement(fallbackPayload);
+        }
 
+        private bool TryBuildPromptDataValues(Guid applicationId, ApplicationFormSubmission? formSubmission, out Dictionary<string, JsonElement> values)
+        {
+            values = new Dictionary<string, JsonElement>(StringComparer.OrdinalIgnoreCase);
             if (string.IsNullOrWhiteSpace(formSubmission?.Submission))
             {
-                return JsonSerializer.SerializeToElement(new { submission_content = fallbackContent });
+                return false;
             }
 
             try
             {
                 using var submissionDoc = JsonDocument.Parse(formSubmission.Submission);
-                var root = submissionDoc.RootElement;
-
-                JsonElement submissionData = root;
-                if (root.ValueKind == JsonValueKind.Object &&
-                    root.TryGetProperty("data", out var dataElement) &&
-                    dataElement.ValueKind == JsonValueKind.Object)
+                if (!TryExtractSubmissionDataObject(submissionDoc.RootElement, out var submissionData))
                 {
-                    submissionData = dataElement;
-                }
-                else if (root.ValueKind == JsonValueKind.Object &&
-                    root.TryGetProperty("submission", out var submissionElement) &&
-                    submissionElement.ValueKind == JsonValueKind.Object &&
-                    submissionElement.TryGetProperty("data", out var nestedDataElement) &&
-                    nestedDataElement.ValueKind == JsonValueKind.Object)
-                {
-                    submissionData = nestedDataElement;
+                    return false;
                 }
 
-                if (submissionData.ValueKind == JsonValueKind.Object)
-                {
-                    return JsonSerializer.SerializeToElement(BuildPromptDataValues(submissionData));
-                }
+                values = BuildPromptDataValues(submissionData);
+                return true;
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex,
-                    "Failed to parse scoresheet submission JSON for application {ApplicationId}; falling back to summary content.",
-                    application.Id);
+                    "Failed to parse form submission JSON for prompt payload generation for application {ApplicationId}.",
+                    applicationId);
+                return false;
+            }
+        }
+
+        private static bool TryExtractSubmissionDataObject(JsonElement root, out JsonElement submissionData)
+        {
+            submissionData = root;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                return false;
+            }
+
+            if (root.TryGetProperty("data", out var dataElement) && dataElement.ValueKind == JsonValueKind.Object)
+            {
+                submissionData = dataElement;
+                return true;
             }
 
-            return JsonSerializer.SerializeToElement(new { submission_content = fallbackContent });
+            if (root.TryGetProperty("submission", out var submissionElement) &&
+                submissionElement.ValueKind == JsonValueKind.Object &&
+                submissionElement.TryGetProperty("data", out var nestedDataElement) &&
+                nestedDataElement.ValueKind == JsonValueKind.Object)
+            {
+                submissionData = nestedDataElement;
+                return true;
+            }
+
+            return root.ValueKind == JsonValueKind.Object;
         }
 
         private static Dictionary<string, JsonElement> BuildPromptDataValues(JsonElement submissionData)
@@ -544,27 +522,6 @@ private static Dictionary<string, JsonElement> BuildPromptDataValues(JsonElement
             return values;
         }
 
-        private static string BuildScoresheetFallbackContent(Application application, string? renderedFormHtml)
-        {
-            var notSpecified = "Not specified";
-            return $@"
-Project Name: {application.ProjectName}
-Reference Number: {application.ReferenceNo}
-Requested Amount: ${application.RequestedAmount:N2}
-Total Project Budget: ${application.TotalProjectBudget:N2}
-Project Summary: {application.ProjectSummary ?? "Not provided"}
-City: {application.City ?? notSpecified}
-Economic Region: {application.EconomicRegion ?? notSpecified}
-Community: {application.Community ?? notSpecified}
-Project Start Date: {application.ProjectStartDate?.ToShortDateString() ?? notSpecified}
-Project End Date: {application.ProjectEndDate?.ToShortDateString() ?? notSpecified}
-Submission Date: {application.SubmissionDate.ToShortDateString()}
-
-FULL APPLICATION FORM SUBMISSION:
-{renderedFormHtml ?? "Form submission content not available"}
-";
-        }
-
         private void LogFormSubmissionPreview(string? renderedFormHtml)
         {
             _logger.LogInformation("Form submission HTML length: {HtmlLength} characters", renderedFormHtml?.Length ?? 0);
@@ -591,7 +548,7 @@ private async Task ProcessScoresheetSectionAsync(
             {
                 _logger.LogDebug("Processing section {SectionName} for application {ApplicationId}",
                     sectionName, applicationId);
-                var sectionAnswers = await _aiService.GenerateScoresheetSectionAnswersAsync(new ScoresheetSectionRequest
+                var sectionAnswers = await _aiService.GenerateScoresheetSectionAsync(new ScoresheetSectionRequest
                 {
                     Data = scoresheetData,
                     Attachments = scoresheetAttachments,
@@ -930,7 +887,8 @@ private static bool IsValidAnalysisPayload(string analysisJson)
                 if (!root.TryGetProperty(AIJsonKeys.Errors, out var errors) ||
                     !root.TryGetProperty(AIJsonKeys.Warnings, out var warnings) ||
                     !root.TryGetProperty(AIJsonKeys.Summaries, out var summaries) ||
-                    !root.TryGetProperty(AIJsonKeys.Dismissed, out var dismissedItems))
+                    !root.TryGetProperty(AIJsonKeys.NextSteps, out var nextSteps) ||
+                    !root.TryGetProperty(AIJsonKeys.Recommendation, out var recommendation))
                 {
                     return false;
                 }
@@ -940,13 +898,11 @@ private static bool IsValidAnalysisPayload(string analysisJson)
                     return false;
                 }
 
-                if (!IsValidFindingsArray(errors) || !IsValidFindingsArray(warnings) || !IsValidFindingsArray(summaries))
-                {
-                    return false;
-                }
-
-                if (dismissedItems.ValueKind != JsonValueKind.Array ||
-                    dismissedItems.EnumerateArray().Any(id => id.ValueKind != JsonValueKind.String))
+                if (!IsValidFindingsArray(errors) ||
+                    !IsValidFindingsArray(warnings) ||
+                    !IsValidFindingsArray(summaries) ||
+                    !IsValidFindingsArray(nextSteps) ||
+                    !IsValidRecommendation(recommendation))
                 {
                     return false;
                 }
@@ -983,6 +939,12 @@ private static bool IsValidFindingsArray(JsonElement element)
                     return false;
                 }
 
+                if (!finding.TryGetProperty(AIJsonKeys.Hidden, out var hidden) ||
+                    (hidden.ValueKind != JsonValueKind.True && hidden.ValueKind != JsonValueKind.False))
+                {
+                    return false;
+                }
+
                 if (!HasOnlyAllowedProperties(finding, AllowedFindingProperties))
                 {
                     return false;
@@ -992,6 +954,33 @@ private static bool IsValidFindingsArray(JsonElement element)
             return true;
         }
 
+        private static bool IsValidRecommendation(JsonElement element)
+        {
+            if (element.ValueKind != JsonValueKind.Object)
+            {
+                return false;
+            }
+
+            if (!element.TryGetProperty(AIJsonKeys.Decision, out var decision) || decision.ValueKind != JsonValueKind.String)
+            {
+                return false;
+            }
+
+            var decisionValue = decision.GetString();
+            if (!string.Equals(decisionValue, "PROCEED", StringComparison.Ordinal) &&
+                !string.Equals(decisionValue, "HOLD", StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (!element.TryGetProperty(AIJsonKeys.Rationale, out var rationale) || rationale.ValueKind != JsonValueKind.String)
+            {
+                return false;
+            }
+
+            return HasOnlyAllowedProperties(element, AllowedRecommendationProperties);
+        }
+
         private static bool IsValidScoresheetAnswersPayload(string scoresheetJson)
         {
             if (string.IsNullOrWhiteSpace(scoresheetJson))
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/SubmissionAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/SubmissionAppService.cs
index f6c04e0d4e..3bdefcbbd7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/SubmissionAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/SubmissionAppService.cs
@@ -102,6 +102,11 @@ public async Task<BlobDto> GetChefsFileAttachment(Guid? formSubmissionId, Guid?
 
         var contentBytes = response.Content != null ? await response.Content.ReadAsByteArrayAsync() : [];
         var contentType = response.Content?.Headers?.ContentType?.MediaType ?? "application/octet-stream";
+        // Check and decode the file name if it is URL encoded
+        if (!string.IsNullOrEmpty(name) && name.Contains('%'))
+        {
+            name = Uri.UnescapeDataString(name); 
+        }
 
         return new BlobDto { Name = name, Content = contentBytes, ContentType = contentType };
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj
index ff57bfd948..c728a8ec10 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj
@@ -12,6 +12,7 @@
     <Compile Remove="Intake\**" />
     <EmbeddedResource Remove="Intake\**" />
     <None Remove="Intake\**" />
+    <ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Application.Contracts\Unity.AI.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Flex\src\Unity.Flex.Application\Unity.Flex.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Notifications\src\Unity.Notifications.Application\Unity.Notifications.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Payments\src\Unity.Payments.Application\Unity.Payments.Application.csproj" />
@@ -47,4 +48,11 @@
 	<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="9.1.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="AI\Prompts\Versions\**\*.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>
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 85143a12dd..00e7708474 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
@@ -153,11 +153,6 @@
     "Permission:GrantManagerManagement.ApplicationForms.Default": "Manage Forms",
     "Permission:GrantApplicationManagement.Approvals.BulkApplicationApproval": "Bulk Application Approval",
     "Permission:GrantApplicationManagement.AIReporting.Default": "AI Reporting",
-    "Permission:AI": "AI",
-    "Permission:AI.Reporting": "AI Reporting",
-    "Permission:AI.ApplicationAnalysis": "AI Application Analysis",
-    "Permission:AI.AttachmentSummary": "AI Attachment Summary",
-    "Permission:AI.ScoringAssistant": "AI Scoring Assistant",
 
     "ApplicationForms": "Forms",
     "ApplicationForms:Description": "Description",
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantApplicationPermissions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantApplicationPermissions.cs
index 171c99656a..73afc90266 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantApplicationPermissions.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantApplicationPermissions.cs
@@ -41,31 +41,7 @@ public static class Applicants
             public const string ApplicantInfoDefault = Default + ".ApplicantInfo";
             public const string EditRedStop          = ApplicantInfoDefault + ".EditRedStop";
         }
-
-        public static class AI
-        {
-            public const string GroupName = "AI";
-
-            public static class Reporting
-            {
-                public const string Default = GroupName + ".Reporting";
-            }
-
-            public static class ApplicationAnalysis
-            {
-                public const string Default = GroupName + ".ApplicationAnalysis";
-            }
-
-            public static class AttachmentSummary
-            {
-                public const string Default = GroupName + ".AttachmentSummary";
-            }
-
-            public static class ScoringAssistant
-            {
-                public const string Default = GroupName + ".ScoringAssistant";
-            }
-        }
+        
 
         public static class Assignments
         {
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 ee2bdd7ed2..31f7143595 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
@@ -14,6 +14,7 @@
 using Unity.Flex.EntityFrameworkCore;
 using Unity.Notifications.EntityFrameworkCore;
 using Unity.Reporting.EntityFrameworkCore;
+using Unity.AI.EntityFrameworkCore;
 using Unity.GrantManager.GlobalTag;
 using Unity.GrantManager.Contacts;
 
@@ -379,6 +380,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ConfigureFlex();
             modelBuilder.ConfigureNotifications();
             modelBuilder.ConfigureReporting();
+            modelBuilder.ConfigureAI();
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260306195601_AISchema.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260306195601_AISchema.Designer.cs
new file mode 100644
index 0000000000..ff79404fd3
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260306195601_AISchema.Designer.cs
@@ -0,0 +1,2694 @@
+// <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.HostMigrations
+{
+    [DbContext(typeof(GrantManagerDbContext))]
+    [Migration("20260306195601_AISchema")]
+    partial class AISchema
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzBlobTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<byte[]>("BlobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("blob_data");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_blob_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCalendar", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("CalendarName")
+                        .HasColumnType("text")
+                        .HasColumnName("calendar_name");
+
+                    b.Property<byte[]>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("calendar");
+
+                    b.HasKey("SchedulerName", "CalendarName");
+
+                    b.ToTable("qrtz_calendars", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCronTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("CronExpression")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("cron_expression");
+
+                    b.Property<string>("TimeZoneId")
+                        .HasColumnType("text")
+                        .HasColumnName("time_zone_id");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_cron_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzFiredTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("EntryId")
+                        .HasColumnType("text")
+                        .HasColumnName("entry_id");
+
+                    b.Property<long>("FiredTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("fired_time");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("instance_name");
+
+                    b.Property<bool>("IsNonConcurrent")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_nonconcurrent");
+
+                    b.Property<string>("JobGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<bool?>("RequestsRecovery")
+                        .HasColumnType("bool")
+                        .HasColumnName("requests_recovery");
+
+                    b.Property<long>("ScheduledTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("sched_time");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("state");
+
+                    b.Property<string>("TriggerGroup")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("TriggerName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.HasKey("SchedulerName", "EntryId");
+
+                    b.HasIndex("InstanceName")
+                        .HasDatabaseName("idx_qrtz_ft_trig_inst_name");
+
+                    b.HasIndex("JobGroup")
+                        .HasDatabaseName("idx_qrtz_ft_job_group");
+
+                    b.HasIndex("JobName")
+                        .HasDatabaseName("idx_qrtz_ft_job_name");
+
+                    b.HasIndex("RequestsRecovery")
+                        .HasDatabaseName("idx_qrtz_ft_job_req_recovery");
+
+                    b.HasIndex("TriggerGroup")
+                        .HasDatabaseName("idx_qrtz_ft_trig_group");
+
+                    b.HasIndex("TriggerName")
+                        .HasDatabaseName("idx_qrtz_ft_trig_name");
+
+                    b.HasIndex("SchedulerName", "TriggerName", "TriggerGroup")
+                        .HasDatabaseName("idx_qrtz_ft_trig_nm_gp");
+
+                    b.ToTable("qrtz_fired_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("JobName")
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<string>("JobGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<bool>("IsDurable")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_durable");
+
+                    b.Property<bool>("IsNonConcurrent")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_nonconcurrent");
+
+                    b.Property<bool>("IsUpdateData")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_update_data");
+
+                    b.Property<string>("JobClassName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_class_name");
+
+                    b.Property<byte[]>("JobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("job_data");
+
+                    b.Property<bool>("RequestsRecovery")
+                        .HasColumnType("bool")
+                        .HasColumnName("requests_recovery");
+
+                    b.HasKey("SchedulerName", "JobName", "JobGroup");
+
+                    b.HasIndex("RequestsRecovery")
+                        .HasDatabaseName("idx_qrtz_j_req_recovery");
+
+                    b.ToTable("qrtz_job_details", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzLock", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("LockName")
+                        .HasColumnType("text")
+                        .HasColumnName("lock_name");
+
+                    b.HasKey("SchedulerName", "LockName");
+
+                    b.ToTable("qrtz_locks", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzPausedTriggerGroup", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.HasKey("SchedulerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_paused_trigger_grps", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSchedulerState", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("InstanceName")
+                        .HasColumnType("text")
+                        .HasColumnName("instance_name");
+
+                    b.Property<long>("CheckInInterval")
+                        .HasColumnType("bigint")
+                        .HasColumnName("checkin_interval");
+
+                    b.Property<long>("LastCheckInTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("last_checkin_time");
+
+                    b.HasKey("SchedulerName", "InstanceName");
+
+                    b.ToTable("qrtz_scheduler_state", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimplePropertyTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<bool?>("BooleanProperty1")
+                        .HasColumnType("bool")
+                        .HasColumnName("bool_prop_1");
+
+                    b.Property<bool?>("BooleanProperty2")
+                        .HasColumnType("bool")
+                        .HasColumnName("bool_prop_2");
+
+                    b.Property<decimal?>("DecimalProperty1")
+                        .HasColumnType("numeric")
+                        .HasColumnName("dec_prop_1");
+
+                    b.Property<decimal?>("DecimalProperty2")
+                        .HasColumnType("numeric")
+                        .HasColumnName("dec_prop_2");
+
+                    b.Property<int?>("IntegerProperty1")
+                        .HasColumnType("integer")
+                        .HasColumnName("int_prop_1");
+
+                    b.Property<int?>("IntegerProperty2")
+                        .HasColumnType("integer")
+                        .HasColumnName("int_prop_2");
+
+                    b.Property<long?>("LongProperty1")
+                        .HasColumnType("bigint")
+                        .HasColumnName("long_prop_1");
+
+                    b.Property<long?>("LongProperty2")
+                        .HasColumnType("bigint")
+                        .HasColumnName("long_prop_2");
+
+                    b.Property<string>("StringProperty1")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_1");
+
+                    b.Property<string>("StringProperty2")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_2");
+
+                    b.Property<string>("StringProperty3")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_3");
+
+                    b.Property<string>("TimeZoneId")
+                        .HasColumnType("text")
+                        .HasColumnName("time_zone_id");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_simprop_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimpleTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<long>("RepeatCount")
+                        .HasColumnType("bigint")
+                        .HasColumnName("repeat_count");
+
+                    b.Property<long>("RepeatInterval")
+                        .HasColumnType("bigint")
+                        .HasColumnName("repeat_interval");
+
+                    b.Property<long>("TimesTriggered")
+                        .HasColumnType("bigint")
+                        .HasColumnName("times_triggered");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_simple_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("CalendarName")
+                        .HasColumnType("text")
+                        .HasColumnName("calendar_name");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<long?>("EndTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("end_time");
+
+                    b.Property<byte[]>("JobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("job_data");
+
+                    b.Property<string>("JobGroup")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<short?>("MisfireInstruction")
+                        .HasColumnType("smallint")
+                        .HasColumnName("misfire_instr");
+
+                    b.Property<long?>("NextFireTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("next_fire_time");
+
+                    b.Property<long?>("PreviousFireTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("prev_fire_time");
+
+                    b.Property<int?>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<long>("StartTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("start_time");
+
+                    b.Property<string>("TriggerState")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_state");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_type");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.HasIndex("NextFireTime")
+                        .HasDatabaseName("idx_qrtz_t_next_fire_time");
+
+                    b.HasIndex("TriggerState")
+                        .HasDatabaseName("idx_qrtz_t_state");
+
+                    b.HasIndex("NextFireTime", "TriggerState")
+                        .HasDatabaseName("idx_qrtz_t_nft_st");
+
+                    b.HasIndex("SchedulerName", "JobName", "JobGroup");
+
+                    b.ToTable("qrtz_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applicants.ApplicantTenantMap", 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>("LastUpdated")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("OidcSubUsername")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("TenantName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSubUsername");
+
+                    b.HasIndex("OidcSubUsername", "TenantId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicantTenantMaps", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Integrations.CasClientCode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientCode")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.Property<string>("ClientId")
+                        .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<string>("FinancialMinistry")
+                        .HasColumnType("text");
+
+                    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<DateTimeOffset?>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("MinistryPrefix")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CasClientCodes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Integrations.DynamicUrl", 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<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("KeyName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    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<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DynamicUrls", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Community", 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<string>("RegionalDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Communities", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.EconomicRegion", 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>("EconomicRegionCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegionName")
+                        .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.HasKey("Id");
+
+                    b.ToTable("EconomicRegions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.ElectoralDistrict", 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>("ElectoralDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrictName")
+                        .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.HasKey("Id");
+
+                    b.ToTable("ElectoralDistricts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.RegionalDistrict", 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>("EconomicRegionCode")
+                        .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>("RegionalDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrictName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RegionalDistricts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Sector", 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>("SectorCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sectors", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", 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<Guid>("SectorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("SubSectorCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSectorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectorId");
+
+                    b.ToTable("SubSectors", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Tokens.TenantToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    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>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TenantTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)")
+                        .HasColumnName("ApplicationName");
+
+                    b.Property<string>("BrowserInfo")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("BrowserInfo");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ClientId");
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ClientIpAddress");
+
+                    b.Property<string>("ClientName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("ClientName");
+
+                    b.Property<string>("Comments")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Comments");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("CorrelationId");
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnType("integer")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HttpMethod")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("HttpMethod");
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnType("integer")
+                        .HasColumnName("HttpStatusCode");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("ImpersonatorTenantId");
+
+                    b.Property<string>("ImpersonatorTenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ImpersonatorTenantName");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("ImpersonatorUserId");
+
+                    b.Property<string>("ImpersonatorUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("ImpersonatorUserName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("TenantName");
+
+                    b.Property<string>("Url")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Url");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("UserId");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AuditLogs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnType("integer")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("ExecutionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("MethodName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("MethodName");
+
+                    b.Property<string>("Parameters")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("Parameters");
+
+                    b.Property<string>("ServiceName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("ServiceName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AuditLogActions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("ChangeTime");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("ChangeType");
+
+                    b.Property<string>("EntityId")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("EntityId");
+
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("EntityTypeFullName");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("EntityChanges", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("NewValue")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("NewValue");
+
+                    b.Property<string>("OriginalValue")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("OriginalValue");
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("PropertyName");
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("PropertyTypeFullName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("EntityPropertyChanges", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", 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<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsAbandoned")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("JobArgs")
+                        .IsRequired()
+                        .HasMaxLength(1048576)
+                        .HasColumnType("character varying(1048576)");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime?>("LastTryTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("NextTryTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<byte>("Priority")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasDefaultValue((byte)15);
+
+                    b.Property<short>("TryCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasDefaultValue((short)0);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsAbandoned", "NextTryTime");
+
+                    b.ToTable("BackgroundJobs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AllowedProviders")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsAvailableToHost")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ValueType")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Features", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("FeatureGroups", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("FeatureValues", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", 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<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("Regex")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("RegexDescription")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ClaimTypes", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("SourceTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TargetTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
+                        .IsUnique();
+
+                    b.ToTable("LinkUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", 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<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsDefault");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsPublic");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsStatic");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("Roles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Action")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<string>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<string>("BrowserInfo")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Identity")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Action");
+
+                    b.HasIndex("TenantId", "ApplicationName");
+
+                    b.HasIndex("TenantId", "Identity");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("SecurityLogs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Device")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("DeviceInfo")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IpAddresses")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<DateTime?>("LastAccessed")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("SessionId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("SignedIn")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Device");
+
+                    b.HasIndex("SessionId");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("Sessions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("AccessFailedCount");
+
+                    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>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("EmailConfirmed");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsActive");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsExternal")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsExternal");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTimeOffset?>("LastPasswordChangeTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Name");
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("NormalizedEmail");
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("NormalizedUserName");
+
+                    b.Property<string>("OidcSub")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PasswordHash")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("PasswordHash");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("PhoneNumberConfirmed");
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("SecurityStamp");
+
+                    b.Property<bool>("ShouldChangePasswordOnNextLogin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Surname")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Surname");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserDelegations", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(196)
+                        .HasColumnType("character varying(196)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("UserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("OrganizationUnitId", "UserId");
+
+                    b.HasIndex("UserId", "OrganizationUnitId");
+
+                    b.ToTable("UserOrganizationUnits", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("UserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("UserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasMaxLength(95)
+                        .HasColumnType("character varying(95)")
+                        .HasColumnName("Code");
+
+                    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>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("DisplayName");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    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?>("ParentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("OrganizationUnits", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("OrganizationUnitId", "RoleId");
+
+                    b.HasIndex("RoleId", "OrganizationUnitId");
+
+                    b.ToTable("OrganizationUnitRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<byte>("MultiTenancySide")
+                        .HasColumnType("smallint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Permissions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("PermissionGrants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("PermissionGroups", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("Settings", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEncrypted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsInherited")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("SettingDefinitions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", 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<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    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()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("Tenants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("TenantId", "Name");
+
+                    b.ToTable("TenantConnectionStrings", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzBlobTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("BlobTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCronTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("CronTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimplePropertyTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("SimplePropertyTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimpleTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("SimpleTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", "JobDetail")
+                        .WithMany("Triggers")
+                        .HasForeignKey("SchedulerName", "JobName", "JobGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("JobDetail");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Locality.Sector", "Sector")
+                        .WithMany("SubSectors")
+                        .HasForeignKey("SectorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Sector");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("OrganizationUnits")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("ParentId");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
+                        .WithMany("ConnectionStrings")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", b =>
+                {
+                    b.Navigation("Triggers");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.Navigation("BlobTriggers");
+
+                    b.Navigation("CronTriggers");
+
+                    b.Navigation("SimplePropertyTriggers");
+
+                    b.Navigation("SimpleTriggers");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Sector", b =>
+                {
+                    b.Navigation("SubSectors");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Navigation("Actions");
+
+                    b.Navigation("EntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Navigation("PropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Navigation("Claims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Navigation("Claims");
+
+                    b.Navigation("Logins");
+
+                    b.Navigation("OrganizationUnits");
+
+                    b.Navigation("Roles");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Navigation("Roles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Navigation("ConnectionStrings");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260306195601_AISchema.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260306195601_AISchema.cs
new file mode 100644
index 0000000000..1c85f5cb8a
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260306195601_AISchema.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    /// <inheritdoc />
+    public partial class AISchema : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(name: "AI");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260307012926_Fixsnaphot.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260307012926_Fixsnaphot.Designer.cs
new file mode 100644
index 0000000000..bd71f649e4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260307012926_Fixsnaphot.Designer.cs
@@ -0,0 +1,2694 @@
+// <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.HostMigrations
+{
+    [DbContext(typeof(GrantManagerDbContext))]
+    [Migration("20260307012926_Fixsnaphot")]
+    partial class Fixsnaphot
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzBlobTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<byte[]>("BlobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("blob_data");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_blob_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCalendar", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("CalendarName")
+                        .HasColumnType("text")
+                        .HasColumnName("calendar_name");
+
+                    b.Property<byte[]>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("calendar");
+
+                    b.HasKey("SchedulerName", "CalendarName");
+
+                    b.ToTable("qrtz_calendars", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCronTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("CronExpression")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("cron_expression");
+
+                    b.Property<string>("TimeZoneId")
+                        .HasColumnType("text")
+                        .HasColumnName("time_zone_id");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_cron_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzFiredTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("EntryId")
+                        .HasColumnType("text")
+                        .HasColumnName("entry_id");
+
+                    b.Property<long>("FiredTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("fired_time");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("instance_name");
+
+                    b.Property<bool>("IsNonConcurrent")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_nonconcurrent");
+
+                    b.Property<string>("JobGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<bool?>("RequestsRecovery")
+                        .HasColumnType("bool")
+                        .HasColumnName("requests_recovery");
+
+                    b.Property<long>("ScheduledTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("sched_time");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("state");
+
+                    b.Property<string>("TriggerGroup")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("TriggerName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.HasKey("SchedulerName", "EntryId");
+
+                    b.HasIndex("InstanceName")
+                        .HasDatabaseName("idx_qrtz_ft_trig_inst_name");
+
+                    b.HasIndex("JobGroup")
+                        .HasDatabaseName("idx_qrtz_ft_job_group");
+
+                    b.HasIndex("JobName")
+                        .HasDatabaseName("idx_qrtz_ft_job_name");
+
+                    b.HasIndex("RequestsRecovery")
+                        .HasDatabaseName("idx_qrtz_ft_job_req_recovery");
+
+                    b.HasIndex("TriggerGroup")
+                        .HasDatabaseName("idx_qrtz_ft_trig_group");
+
+                    b.HasIndex("TriggerName")
+                        .HasDatabaseName("idx_qrtz_ft_trig_name");
+
+                    b.HasIndex("SchedulerName", "TriggerName", "TriggerGroup")
+                        .HasDatabaseName("idx_qrtz_ft_trig_nm_gp");
+
+                    b.ToTable("qrtz_fired_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("JobName")
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<string>("JobGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<bool>("IsDurable")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_durable");
+
+                    b.Property<bool>("IsNonConcurrent")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_nonconcurrent");
+
+                    b.Property<bool>("IsUpdateData")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_update_data");
+
+                    b.Property<string>("JobClassName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_class_name");
+
+                    b.Property<byte[]>("JobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("job_data");
+
+                    b.Property<bool>("RequestsRecovery")
+                        .HasColumnType("bool")
+                        .HasColumnName("requests_recovery");
+
+                    b.HasKey("SchedulerName", "JobName", "JobGroup");
+
+                    b.HasIndex("RequestsRecovery")
+                        .HasDatabaseName("idx_qrtz_j_req_recovery");
+
+                    b.ToTable("qrtz_job_details", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzLock", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("LockName")
+                        .HasColumnType("text")
+                        .HasColumnName("lock_name");
+
+                    b.HasKey("SchedulerName", "LockName");
+
+                    b.ToTable("qrtz_locks", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzPausedTriggerGroup", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.HasKey("SchedulerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_paused_trigger_grps", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSchedulerState", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("InstanceName")
+                        .HasColumnType("text")
+                        .HasColumnName("instance_name");
+
+                    b.Property<long>("CheckInInterval")
+                        .HasColumnType("bigint")
+                        .HasColumnName("checkin_interval");
+
+                    b.Property<long>("LastCheckInTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("last_checkin_time");
+
+                    b.HasKey("SchedulerName", "InstanceName");
+
+                    b.ToTable("qrtz_scheduler_state", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimplePropertyTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<bool?>("BooleanProperty1")
+                        .HasColumnType("bool")
+                        .HasColumnName("bool_prop_1");
+
+                    b.Property<bool?>("BooleanProperty2")
+                        .HasColumnType("bool")
+                        .HasColumnName("bool_prop_2");
+
+                    b.Property<decimal?>("DecimalProperty1")
+                        .HasColumnType("numeric")
+                        .HasColumnName("dec_prop_1");
+
+                    b.Property<decimal?>("DecimalProperty2")
+                        .HasColumnType("numeric")
+                        .HasColumnName("dec_prop_2");
+
+                    b.Property<int?>("IntegerProperty1")
+                        .HasColumnType("integer")
+                        .HasColumnName("int_prop_1");
+
+                    b.Property<int?>("IntegerProperty2")
+                        .HasColumnType("integer")
+                        .HasColumnName("int_prop_2");
+
+                    b.Property<long?>("LongProperty1")
+                        .HasColumnType("bigint")
+                        .HasColumnName("long_prop_1");
+
+                    b.Property<long?>("LongProperty2")
+                        .HasColumnType("bigint")
+                        .HasColumnName("long_prop_2");
+
+                    b.Property<string>("StringProperty1")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_1");
+
+                    b.Property<string>("StringProperty2")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_2");
+
+                    b.Property<string>("StringProperty3")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_3");
+
+                    b.Property<string>("TimeZoneId")
+                        .HasColumnType("text")
+                        .HasColumnName("time_zone_id");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_simprop_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimpleTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<long>("RepeatCount")
+                        .HasColumnType("bigint")
+                        .HasColumnName("repeat_count");
+
+                    b.Property<long>("RepeatInterval")
+                        .HasColumnType("bigint")
+                        .HasColumnName("repeat_interval");
+
+                    b.Property<long>("TimesTriggered")
+                        .HasColumnType("bigint")
+                        .HasColumnName("times_triggered");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_simple_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("CalendarName")
+                        .HasColumnType("text")
+                        .HasColumnName("calendar_name");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<long?>("EndTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("end_time");
+
+                    b.Property<byte[]>("JobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("job_data");
+
+                    b.Property<string>("JobGroup")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<short?>("MisfireInstruction")
+                        .HasColumnType("smallint")
+                        .HasColumnName("misfire_instr");
+
+                    b.Property<long?>("NextFireTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("next_fire_time");
+
+                    b.Property<long?>("PreviousFireTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("prev_fire_time");
+
+                    b.Property<int?>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<long>("StartTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("start_time");
+
+                    b.Property<string>("TriggerState")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_state");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_type");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.HasIndex("NextFireTime")
+                        .HasDatabaseName("idx_qrtz_t_next_fire_time");
+
+                    b.HasIndex("TriggerState")
+                        .HasDatabaseName("idx_qrtz_t_state");
+
+                    b.HasIndex("NextFireTime", "TriggerState")
+                        .HasDatabaseName("idx_qrtz_t_nft_st");
+
+                    b.HasIndex("SchedulerName", "JobName", "JobGroup");
+
+                    b.ToTable("qrtz_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applicants.ApplicantTenantMap", 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>("LastUpdated")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("OidcSubUsername")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("TenantName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSubUsername");
+
+                    b.HasIndex("OidcSubUsername", "TenantId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicantTenantMaps", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Integrations.CasClientCode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientCode")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.Property<string>("ClientId")
+                        .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<string>("FinancialMinistry")
+                        .HasColumnType("text");
+
+                    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<DateTimeOffset?>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("MinistryPrefix")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CasClientCodes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Integrations.DynamicUrl", 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<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("KeyName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    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<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DynamicUrls", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Community", 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<string>("RegionalDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Communities", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.EconomicRegion", 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>("EconomicRegionCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegionName")
+                        .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.HasKey("Id");
+
+                    b.ToTable("EconomicRegions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.ElectoralDistrict", 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>("ElectoralDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrictName")
+                        .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.HasKey("Id");
+
+                    b.ToTable("ElectoralDistricts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.RegionalDistrict", 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>("EconomicRegionCode")
+                        .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>("RegionalDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrictName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RegionalDistricts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Sector", 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>("SectorCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sectors", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", 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<Guid>("SectorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("SubSectorCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSectorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectorId");
+
+                    b.ToTable("SubSectors", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Tokens.TenantToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    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>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TenantTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)")
+                        .HasColumnName("ApplicationName");
+
+                    b.Property<string>("BrowserInfo")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("BrowserInfo");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ClientId");
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ClientIpAddress");
+
+                    b.Property<string>("ClientName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("ClientName");
+
+                    b.Property<string>("Comments")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Comments");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("CorrelationId");
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnType("integer")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HttpMethod")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("HttpMethod");
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnType("integer")
+                        .HasColumnName("HttpStatusCode");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("ImpersonatorTenantId");
+
+                    b.Property<string>("ImpersonatorTenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ImpersonatorTenantName");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("ImpersonatorUserId");
+
+                    b.Property<string>("ImpersonatorUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("ImpersonatorUserName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("TenantName");
+
+                    b.Property<string>("Url")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Url");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("UserId");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AuditLogs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnType("integer")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("ExecutionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("MethodName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("MethodName");
+
+                    b.Property<string>("Parameters")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("Parameters");
+
+                    b.Property<string>("ServiceName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("ServiceName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AuditLogActions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("ChangeTime");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("ChangeType");
+
+                    b.Property<string>("EntityId")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("EntityId");
+
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("EntityTypeFullName");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("EntityChanges", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("NewValue")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("NewValue");
+
+                    b.Property<string>("OriginalValue")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("OriginalValue");
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("PropertyName");
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("PropertyTypeFullName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("EntityPropertyChanges", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", 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<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsAbandoned")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("JobArgs")
+                        .IsRequired()
+                        .HasMaxLength(1048576)
+                        .HasColumnType("character varying(1048576)");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime?>("LastTryTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("NextTryTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<byte>("Priority")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasDefaultValue((byte)15);
+
+                    b.Property<short>("TryCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasDefaultValue((short)0);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsAbandoned", "NextTryTime");
+
+                    b.ToTable("BackgroundJobs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AllowedProviders")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsAvailableToHost")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ValueType")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Features", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("FeatureGroups", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("FeatureValues", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", 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<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("Regex")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("RegexDescription")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ClaimTypes", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("SourceTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TargetTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
+                        .IsUnique();
+
+                    b.ToTable("LinkUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", 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<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsDefault");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsPublic");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsStatic");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("Roles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Action")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<string>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<string>("BrowserInfo")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Identity")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Action");
+
+                    b.HasIndex("TenantId", "ApplicationName");
+
+                    b.HasIndex("TenantId", "Identity");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("SecurityLogs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Device")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("DeviceInfo")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IpAddresses")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<DateTime?>("LastAccessed")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("SessionId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("SignedIn")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Device");
+
+                    b.HasIndex("SessionId");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("Sessions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("AccessFailedCount");
+
+                    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>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("EmailConfirmed");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsActive");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsExternal")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsExternal");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTimeOffset?>("LastPasswordChangeTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Name");
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("NormalizedEmail");
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("NormalizedUserName");
+
+                    b.Property<string>("OidcSub")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PasswordHash")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("PasswordHash");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("PhoneNumberConfirmed");
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("SecurityStamp");
+
+                    b.Property<bool>("ShouldChangePasswordOnNextLogin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Surname")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Surname");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserDelegations", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(196)
+                        .HasColumnType("character varying(196)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("UserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("OrganizationUnitId", "UserId");
+
+                    b.HasIndex("UserId", "OrganizationUnitId");
+
+                    b.ToTable("UserOrganizationUnits", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("UserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("UserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasMaxLength(95)
+                        .HasColumnType("character varying(95)")
+                        .HasColumnName("Code");
+
+                    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>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("DisplayName");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    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?>("ParentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("OrganizationUnits", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("OrganizationUnitId", "RoleId");
+
+                    b.HasIndex("RoleId", "OrganizationUnitId");
+
+                    b.ToTable("OrganizationUnitRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<byte>("MultiTenancySide")
+                        .HasColumnType("smallint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Permissions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("PermissionGrants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("PermissionGroups", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("Settings", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEncrypted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsInherited")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("SettingDefinitions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", 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<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    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()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("Tenants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("TenantId", "Name");
+
+                    b.ToTable("TenantConnectionStrings", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzBlobTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("BlobTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCronTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("CronTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimplePropertyTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("SimplePropertyTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimpleTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("SimpleTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", "JobDetail")
+                        .WithMany("Triggers")
+                        .HasForeignKey("SchedulerName", "JobName", "JobGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("JobDetail");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Locality.Sector", "Sector")
+                        .WithMany("SubSectors")
+                        .HasForeignKey("SectorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Sector");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("OrganizationUnits")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("ParentId");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
+                        .WithMany("ConnectionStrings")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", b =>
+                {
+                    b.Navigation("Triggers");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.Navigation("BlobTriggers");
+
+                    b.Navigation("CronTriggers");
+
+                    b.Navigation("SimplePropertyTriggers");
+
+                    b.Navigation("SimpleTriggers");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Sector", b =>
+                {
+                    b.Navigation("SubSectors");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Navigation("Actions");
+
+                    b.Navigation("EntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Navigation("PropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Navigation("Claims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Navigation("Claims");
+
+                    b.Navigation("Logins");
+
+                    b.Navigation("OrganizationUnits");
+
+                    b.Navigation("Roles");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Navigation("Roles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Navigation("ConnectionStrings");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260307012926_Fixsnaphot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260307012926_Fixsnaphot.cs
new file mode 100644
index 0000000000..74899e427c
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260307012926_Fixsnaphot.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    /// <inheritdoc />
+    public partial class Fixsnaphot : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {           
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {           
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs
index f4cf613605..d034c14e8e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs
@@ -472,16 +472,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid");
 
-                    b.Property<string>("ClientCode")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClientId")
-                        .HasColumnType("text");
-
                     b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
                         .IsRequired()
-                        .HasColumnType("text");
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
 
                     b.Property<DateTime>("CreationTime")
                         .HasColumnType("timestamp without time zone")
@@ -491,15 +487,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("CreatorId");
 
-                    b.Property<string>("Description")
+                    b.Property<string>("ExtraProperties")
                         .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("FinancialMinistry")
-                        .HasColumnType("text");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("boolean");
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
 
                     b.Property<DateTime>("LastUpdated")
                         .HasColumnType("timestamp without time zone");
@@ -525,6 +516,84 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ApplicantTenantMaps", (string)null);
                 });
 
+            modelBuilder.Entity("Unity.GrantManager.Integrations.CasClientCode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientCode")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.Property<string>("ClientId")
+                        .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<string>("FinancialMinistry")
+                        .HasColumnType("text");
+
+                    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<DateTimeOffset?>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("MinistryPrefix")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CasClientCodes", (string)null);
+                });
+
             modelBuilder.Entity("Unity.GrantManager.Integrations.DynamicUrl", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj
index 6d06183c85..7a957daef7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj
@@ -43,6 +43,7 @@
 		<ProjectReference Include="..\..\modules\Unity.Flex\src\Unity.Flex.Application\Unity.Flex.Application.csproj" />
 		<ProjectReference Include="..\..\modules\Unity.Payments\src\Unity.Payments.Application\Unity.Payments.Application.csproj" />
 		<ProjectReference Include="..\..\modules\Unity.Reporting\src\Unity.Reporting.Application\Unity.Reporting.Application.csproj" />
+		<ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Application\Unity.AI.Application.csproj" />
 		<ProjectReference Include="..\Unity.GrantManager.Domain\Unity.GrantManager.Domain.csproj" />
 		<PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.PostgreSQL" Version="0.5.1" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs
index caf91fc168..826590b751 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs
@@ -75,6 +75,7 @@
 using Unity.Modules.Shared.Utils;
 using Unity.Notifications.Web.Bundling;
 using Unity.Reporting.Web;
+using Unity.AI.Web;
 using Unity.GrantManager.Web.Views.Settings;
 
 namespace Unity.GrantManager.Web;
@@ -99,7 +100,8 @@ namespace Unity.GrantManager.Web;
     typeof(AbpBlobStoringModule),
     typeof(NotificationsWebModule),
     typeof(FlexWebModule),
-    typeof(ReportingWebModule)
+    typeof(ReportingWebModule),
+    typeof(AIWebModule)
 )]
 
 public class GrantManagerWebModule : AbpModule
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Menus/GrantManagerMenuContributor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Menus/GrantManagerMenuContributor.cs
index f881f05e38..f5fe33bf96 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Menus/GrantManagerMenuContributor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Menus/GrantManagerMenuContributor.cs
@@ -1,14 +1,15 @@
-using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
+using Unity.AI.Permissions;
 using Unity.GrantManager.Localization;
 using Unity.GrantManager.Permissions;
 using Unity.Identity.Web.Navigation;
 using Unity.Modules.Shared.Permissions;
 using Unity.TenantManagement;
 using Unity.TenantManagement.Web.Navigation;
+using Volo.Abp.Features;
 using Volo.Abp.Identity;
 using Volo.Abp.UI.Navigation;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Features;
 
 namespace Unity.GrantManager.Web.Menus;
 
@@ -124,7 +125,7 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
                     l["Menu:AIReporting"],
                     "~/AIReporting",
                     icon: "fl fl-view-dashboard",
-                    requiredPermissionName: GrantApplicationPermissions.AI.Reporting.Default,
+                    requiredPermissionName: AIPermissions.Reporting.ReportingDefault,
                     order: 9
                 )
             );
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css
index 8d77b2fed5..93a234809f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css
@@ -20,7 +20,7 @@
 }
 
 /* Left panel tabs scrolling */
-#detailsTab .tab-content {
+#detailsTab > .tab-content {
     overflow-y: auto;
     overflow-x: hidden;
     height: calc(100vh - 220px);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js
index 6b95640637..68a1855b1f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js
@@ -1,6 +1,18 @@
 $(document).ready(function () {
     // Initialize page
     initializeApplicantDetailsPage();
+    scheduleInitialLayoutPasses();
+
+    window.addEventListener('applicant-submissions-layout-changed', function () {
+        applyTabHeightOffset();
+        debouncedResizeAwareDataTables();
+        scheduleDeferredLayoutPass();
+    });
+    window.addEventListener('applicant-addresses-layout-changed', function () {
+        applyTabHeightOffset();
+        debouncedResizeAwareDataTables();
+        scheduleDeferredLayoutPass();
+    });
 
     // Handle breadcrumb back button
     $('#goBackToApplicants').on('click', function () {
@@ -11,11 +23,18 @@ $(document).ready(function () {
     $('button[data-bs-toggle="tab"]').on('shown.bs.tab', function (e) {
         let targetTab = $(e.target).attr('data-bs-target');
         $(targetTab).addClass('fade-in-load visible');
+        if ($(e.target).closest('#detailsTab').length) {
+            syncLeftTabScrollPosition(targetTab);
+            scheduleLeftTabScrollReset(targetTab);
+        }
+        applyTabHeightOffset();
+        scheduleDeferredLayoutPass();
     });
 
     // Add event listeners for tab clicks to adjust DataTables
-    $('#detailsTab li').on('click', function () {
+    $('#detailsTab > .nav-tabs > li').on('click', function () {
         debouncedAdjustTables('detailsTab');
+        scheduleDeferredLayoutPass();
     });
 
     $('#myTabContent li').on('click', function () {
@@ -26,6 +45,11 @@ $(document).ready(function () {
     initializeResizableDivider();
 });
 
+const LEFT_INTERNAL_SCROLL_TABS = new Set(['nav-submissions', 'nav-addresses']);
+const INITIAL_LAYOUT_DELAYS = [0, 120, 300, 650, 1100];
+const DEFERRED_LAYOUT_DELAYS = [0, 30, 120, 250];
+const LEFT_TAB_SCROLL_RESET_DELAYS = [0, 40, 120, 220];
+
 function initializeApplicantDetailsPage() {
     // Hide loading spinner and show content
     setTimeout(function () {
@@ -57,7 +81,7 @@ const debouncedResizeAwareDataTables = debounce(() => {
     $('table[data-resize-aware="true"]:visible').each(function () {
         try {
             const table = $(this).DataTable();
-            table.columns.adjust().draw();
+            table.columns.adjust().draw(false);
         }
         catch (error) {
             console.error('Failed to adjust DataTable columns:', error);
@@ -75,7 +99,7 @@ function adjustVisibleTablesInContainer(containerId) {
     tables.each(function () {
         try {
             const table = $(this).DataTable();
-            table.columns.adjust().draw();
+            table.columns.adjust().draw(false);
         }
         catch (error) {
             console.error('Failed to adjust DataTable in tab:', error);
@@ -84,15 +108,195 @@ function adjustVisibleTablesInContainer(containerId) {
 }
 
 function applyTabHeightOffset() {
+    applyMainContainerHeight();
+    applyLeftPanelLayout();
+    resizeSubmissionsScrollBody();
+    applyRightPanelLayout();
+}
+
+function syncLeftTabScrollPosition(targetTabSelector) {
+    const leftTabContent = document.querySelector('#detailsTab .tab-content');
+    if (!leftTabContent) {
+        return;
+    }
+
+    leftTabContent.scrollTop = 0;
+
+    const targetPane = targetTabSelector ? document.querySelector(targetTabSelector) : null;
+    if (targetPane) {
+        targetPane.scrollTop = 0;
+    }
+}
+
+function scheduleLeftTabScrollReset(targetTabSelector) {
+    LEFT_TAB_SCROLL_RESET_DELAYS.forEach((delay) => {
+        setTimeout(() => {
+            const leftTabContent = document.querySelector('#detailsTab .tab-content');
+            if (leftTabContent) {
+                leftTabContent.scrollTop = 0;
+            }
+
+            const targetPane = targetTabSelector ? document.querySelector(targetTabSelector) : null;
+            if (targetPane) {
+                targetPane.scrollTop = 0;
+                targetPane.querySelectorAll('div, section, form').forEach((element) => {
+                    if (element.scrollTop > 0) {
+                        element.scrollTop = 0;
+                    }
+                });
+            }
+        }, delay);
+    });
+}
+
+function scheduleInitialLayoutPasses() {
+    scheduleLayoutPasses(INITIAL_LAYOUT_DELAYS);
+}
+
+function scheduleDeferredLayoutPass() {
+    scheduleLayoutPasses(DEFERRED_LAYOUT_DELAYS);
+}
+
+function resizeSubmissionsScrollBody() {
+    const submissionsWidget = document.querySelector(
+        '#nav-submissions .applicant-submissions-widget'
+    );
+    const submissionsTableWrapper = document.getElementById(
+        'ApplicantSubmissionsTable_wrapper'
+    );
+    const submissionsScrollBody = submissionsTableWrapper?.querySelector(
+        '.dt-scroll-body'
+    );
+
+    if (!submissionsWidget || !submissionsTableWrapper || !submissionsScrollBody) {
+        return;
+    }
+
+    const widgetRect = submissionsWidget.getBoundingClientRect();
+    const wrapperRect = submissionsTableWrapper.getBoundingClientRect();
+    const availableWrapperHeight = Math.floor(widgetRect.bottom - wrapperRect.top - 8);
+
+    if (availableWrapperHeight <= 0) {
+        return;
+    }
+
+    let reservedHeight = 0;
+    Array.from(submissionsTableWrapper.children).forEach((child) => {
+        const childRect = child.getBoundingClientRect();
+
+        if (child.contains(submissionsScrollBody)) {
+            const bodyRect = submissionsScrollBody.getBoundingClientRect();
+            reservedHeight += Math.max(0, Math.ceil(childRect.height - bodyRect.height));
+            return;
+        }
+
+        reservedHeight += Math.ceil(childRect.height);
+    });
+
+    const maxBodyHeight = Math.max(140, availableWrapperHeight - reservedHeight - 4);
+    submissionsScrollBody.style.maxHeight = `${maxBodyHeight}px`;
+    submissionsScrollBody.style.overflowY = 'auto';
+    submissionsScrollBody.style.overflowX = 'auto';
+}
+
+function resizeApplicantAddressesPane(addressesPane) {
+    const addressesWidget = addressesPane.querySelector('.applicant-addresses-widget');
+    const addressesForm = addressesPane.querySelector('.applicant-organization-info');
+    const innerTabContent = addressesPane.querySelector('.applicant-organization-info > .tab-content');
+    const activeSubPane = innerTabContent?.querySelector('.tab-pane.active');
+
+    if (!addressesWidget || !addressesForm || !innerTabContent || !activeSubPane) {
+        return;
+    }
+
+    const availableWidgetHeight = Math.max(
+        220,
+        Math.floor(addressesPane.getBoundingClientRect().height - 8)
+    );
+    addressesWidget.style.height = `${availableWidgetHeight}px`;
+    addressesWidget.style.minHeight = '0';
+
+    const innerTabContentTop = innerTabContent.getBoundingClientRect().top;
+    const widgetBottom = addressesWidget.getBoundingClientRect().bottom;
+    const availableInnerTabHeight = Math.max(
+        140,
+        Math.floor(widgetBottom - innerTabContentTop - 8)
+    );
+
+    addressesForm.style.height = `${availableWidgetHeight}px`;
+    addressesForm.style.minHeight = '0';
+    innerTabContent.style.height = `${availableInnerTabHeight}px`;
+    innerTabContent.style.minHeight = '0';
+    activeSubPane.style.height = `${innerTabContent.clientHeight || availableInnerTabHeight}px`;
+    activeSubPane.style.minHeight = '0';
+    activeSubPane.style.overflowY = 'auto';
+    activeSubPane.style.overflowX = 'hidden';
+}
+
+function scheduleLayoutPasses(delays) {
+    delays.forEach((delay) => {
+        setTimeout(() => {
+            applyTabHeightOffset();
+            debouncedResizeAwareDataTables();
+        }, delay);
+    });
+}
+
+function applyMainContainerHeight() {
+    const mainContainer = document.getElementById('main-container');
+    if (!mainContainer) {
+        return;
+    }
+
+    const availableMainHeight = getAvailableViewportHeight(mainContainer, 360);
+    mainContainer.style.height = `${availableMainHeight}px`;
+    mainContainer.style.overflow = 'hidden';
+}
+
+function applyLeftPanelLayout() {
     const detailsTab = document.getElementById('detailsTab');
-    if (!detailsTab) return;
-    const tabNav = detailsTab.querySelector('ul.nav-tabs, ul.nav');
-    const tabContent = detailsTab.querySelector('.tab-content');
-    if (!tabNav || !tabContent) return;
-    const baseOffset = 175;
-    const totalOffset = baseOffset + tabNav.clientHeight;
-    tabContent.style.height = `calc(100vh - ${totalOffset}px)`;
-    tabContent.style.overflowY = 'auto';
+    const tabContent = detailsTab?.querySelector('.tab-content');
+    if (!tabContent) {
+        return;
+    }
+
+    const availableLeftHeight = getAvailableViewportHeight(tabContent, 220);
+    tabContent.style.height = `${availableLeftHeight}px`;
+
+    const activeLeftPane = tabContent.querySelector('.tab-pane.active');
+    const activeLeftPaneId = activeLeftPane?.id;
+    const usesInternalScroll = LEFT_INTERNAL_SCROLL_TABS.has(activeLeftPaneId);
+
+    tabContent.style.overflowY = usesInternalScroll ? 'hidden' : 'auto';
+    if (usesInternalScroll) {
+        tabContent.scrollTop = 0;
+    }
+
+    if (activeLeftPaneId === 'nav-addresses' && activeLeftPane) {
+        activeLeftPane.style.height = '100%';
+        activeLeftPane.style.minHeight = '0';
+        activeLeftPane.style.overflow = 'hidden';
+        resizeApplicantAddressesPane(activeLeftPane);
+    }
+}
+
+function applyRightPanelLayout() {
+    const rightTabContent = document.getElementById('myTabContent');
+    if (!rightTabContent) {
+        return;
+    }
+
+    const availableRightHeight = getAvailableViewportHeight(rightTabContent, 220);
+    rightTabContent.style.height = `${availableRightHeight}px`;
+    rightTabContent.style.overflowY = 'auto';
+}
+
+function getAvailableViewportHeight(element, minHeight) {
+    const bottomSpacing = 12;
+    return Math.max(
+        minHeight,
+        Math.floor(window.innerHeight - element.getBoundingClientRect().top - bottomSpacing)
+    );
 }
 
 function initializeResizableDivider() {
@@ -169,4 +373,3 @@ function initializeResizableDivider() {
 
 
 
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js
index 0ff7065093..88fed040f6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js
@@ -376,7 +376,7 @@ $(function () {
 
     function getCreationTimeColumn(columnIndex) {
         return {
-            title: 'Creation Date',
+            title: 'Created Date',
             data: 'creationTime',
             name: 'creationTime',
             className: 'data-table-header',
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 b8d0fcaf5e..838523702e 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
@@ -1,10 +1,10 @@
 @page "{@Model.ApplicationFormSubmissionId?}"
 @* #pragma warning disable S1128 *@
 @using Microsoft.Extensions.Localization
+@using Unity.AI.Permissions
 @using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget
 @using Unity.GrantManager.Flex
 @using Unity.GrantManager.Localization
-@using Unity.GrantManager.Permissions
 @using Unity.GrantManager.Web.Pages.GrantApplications
 @using Unity.GrantManager.Web.Views.Shared.Components.CustomTabWidget
 @using Unity.GrantManager.Web.Views.Shared.Components.DetailsActionBar
@@ -31,7 +31,7 @@
     var notificationsFeatureEnabled = await FeatureChecker.IsEnabledAsync("Unity.Notifications");
     var readEmailGranted = await PermissionChecker.IsGrantedAsync("Notifications.Email");
     var aiApplicationAnalysisEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis")
-        && await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.AI.ApplicationAnalysis.Default);
+        && await PermissionChecker.IsGrantedAsync(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault);
     var flexFeatureEnabled = await FeatureChecker.IsEnabledAsync("Unity.Flex");
 }
 @section styles
@@ -262,12 +262,12 @@
                 <li class="nav-item">
                     <button class="nav-link" id="history-tab" data-bs-toggle="tab" data-bs-target="#history" type="button" role="tab" aria-controls="history" aria-selected="false"><i class="fl fl-history" aria-hidden="true"></i> </button>
                 </li>
-            @if (aiApplicationAnalysisEnabled)
-            {                
-                <li class="nav-item">
-                    <button class="nav-link" id="ai-analysis-tab" data-bs-toggle="tab" data-bs-target="#ai-analysis" type="button" role="tab" aria-controls="ai-analysis" aria-selected="false"><i class="fa-solid fa-wand-sparkles" aria-hidden="true"></i>(<span id="ai_analysis_count">0</span>)</button>
-                </li>
-            }
+            @if (aiApplicationAnalysisEnabled)
+            {                
+                <li class="nav-item">
+                    <button class="nav-link" id="ai-analysis-tab" data-bs-toggle="tab" data-bs-target="#ai-analysis" type="button" role="tab" aria-controls="ai-analysis" aria-selected="false"><span class="ai-analysis-tab-icon-wrap"><i class="fl fl-review-user" aria-hidden="true"></i><span class="ai-analysis-tab-indicator" id="ai_analysis_status" style="display:none;"></span></span></button>
+                </li>
+            }
             </ul>
 
             <div class="tab-content details-scrollable" id="myTabContent">
@@ -397,70 +397,67 @@
                 </div>
                 @*-------- History Tab Section END ---------*@
 
-                @*-------- AI Analysis Tab Section ---------*@
-                @if (aiApplicationAnalysisEnabled)
-                { 
-                <div class="tab-pane fade" id="ai-analysis" role="tabpanel" aria-labelledby="ai-analysis-tab">
-                    <h6 class="fw-bold px-3 pt-4 pb-2 m-0">AI Application Analysis</h6>
-                    <div class="ai-analysis-container">
-                        @* Default message when no analysis data is available *@
-                        <div class="ai-analysis-no-data px-3 py-4" id="aiAnalysisNoData">
-                            <div class="text-center text-muted">
-                                <i class="fa-solid fa-wand-sparkles fa-2x mb-3 opacity-50"></i>
-                                <h6 class="mb-2">No AI Analysis Available</h6>
-                                <p class="small mb-0">AI analysis results will appear here when available.</p>
-                            </div>
-                        </div>
-                        @* Accordion list for errors, warnings, and summary *@
-                        <div class="ai-analysis-accordion-list" id="aiAnalysisAccordionList">
-                            @* Accordion items will be dynamically generated here *@
-                        </div>
-                    </div>
-
-                    @* Hidden HTML templates for AI analysis items *@
-                    <div class="d-none" id="aiAnalysisTemplates">
-                        @* Template for accordion group *@
-                        <div class="ai-analysis-accordion-item" data-template="accordion-group">
-                            <div class="ai-analysis-accordion-header" data-element="header">
-                                <span class="ai-analysis-accordion-arrow"></span>
-                                <i class="ai-analysis-accordion-icon fl" data-element="icon"></i>
-                                <span class="ai-analysis-accordion-title" data-element="title"></span>
-                            </div>
-                            <div class="ai-analysis-accordion-body" data-element="body">
-                                @* Content will be populated here *@
-                            </div>
-                        </div>
-
-                        @* Template for dismissible item (errors/warnings) *@
-                        <div class="ai-analysis-detail-item" data-template="dismissible-item">
-                            <div class="ai-analysis-detail-header">
-                                <div class="ai-analysis-detail-category" data-element="category"></div>
-                                <button type="button" class="ai-analysis-dismiss-btn" data-element="dismiss-btn" title="Dismiss this item">
-                                    <i class="fa fa-times"></i>
-                                </button>
-                            </div>
-                            <div class="ai-analysis-detail-message" data-element="message"></div>
-                        </div>
-
-                        @* Template for dismissed item *@
-                        <div class="ai-analysis-detail-item dismissed" data-template="dismissed-item">
-                            <div class="ai-analysis-detail-header">
-                                <div class="ai-analysis-detail-category" data-element="category"></div>
-                                <button type="button" class="ai-analysis-restore-btn" data-element="restore-btn" title="Restore this item">
-                                    <i class="fa fa-undo"></i>
-                                </button>
-                            </div>
-                            <div class="ai-analysis-detail-message" data-element="message"></div>
-                        </div>
-
-                        @* Template for summary item *@
-                        <div class="ai-analysis-detail-item" data-template="summary-item">
-                            <div class="ai-analysis-detail-category" data-element="category"></div>
+                @if (aiApplicationAnalysisEnabled)
+                { 
+                <div class="tab-pane fade" id="ai-analysis" role="tabpanel" aria-labelledby="ai-analysis-tab">
+                    <div class="d-flex justify-content-between align-items-center px-3 pt-4 pb-2">
+                        <h6 class="fw-bold m-0">AI Application Analysis</h6>
+                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="regenerateAiAnalysis">
+                            <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>Refresh Analysis
+                        </button>
+                    </div>
+                    <div class="ai-analysis-container">
+                        @* Default message when no analysis data is available *@
+                        <div class="ai-analysis-no-data px-3 py-4" id="aiAnalysisNoData">
+                            <div class="text-center text-muted">
+                                <i class="fl fl-review-user fa-2x mb-3 opacity-50"></i>
+                                <h6 class="mb-2">No AI Analysis Available</h6>
+                                <p class="small mb-0">AI analysis results will appear here when available.</p>
+                            </div>
+                        </div>
+                        <div class="ai-analysis-sections px-3 pb-3" id="aiAnalysisSections">
+                            @* Analysis sections will be dynamically generated here *@
+                        </div>
+                    </div>
+
+                    @* Hidden HTML templates for AI analysis items *@
+                    <div class="d-none" id="aiAnalysisTemplates">
+                        <div class="ai-analysis-section" data-template="section">
+                            <div class="ai-analysis-section-header">
+                                <div class="ai-analysis-section-title-row">
+                                    <i class="ai-analysis-section-icon fl" data-element="icon"></i>
+                                    <span class="ai-analysis-section-title" data-element="title"></span>
+                                </div>
+                                <span data-element="status-chip" style="display:none;"></span>
+                                <button type="button" class="ai-analysis-section-toggle" data-element="hidden-toggle" style="display:none;"></button>
+                            </div>
+                            <div class="ai-analysis-section-body">
+                                <div data-element="items"></div>
+                            </div>
+                        </div>
+
+                        <div class="ai-analysis-detail-item" data-template="active-item">
+                            <div class="ai-analysis-detail-header">
+                                <div class="ai-analysis-detail-category" data-element="category"></div>
+                                <button type="button" class="ai-analysis-action-btn" data-element="hide-btn" title="Hide this item">
+                                    Hide
+                                </button>
+                            </div>
                             <div class="ai-analysis-detail-message" data-element="message"></div>
                         </div>
-                    </div>
-                </div>
-                }
+
+                        <div class="ai-analysis-detail-item hidden-item" data-template="hidden-item">
+                            <div class="ai-analysis-detail-header">
+                                <div class="ai-analysis-detail-category" data-element="category"></div>
+                                <button type="button" class="ai-analysis-action-btn" data-element="show-btn" title="Show this item">
+                                    Show
+                                </button>
+                            </div>
+                            <div class="ai-analysis-detail-message" data-element="message"></div>
+                        </div>
+                    </div>
+                </div>
+                }
                 @*-------- AI Analysis Tab Section END ---------*@
             </div>
 
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 127162c6f3..4ad7bd5371 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
@@ -391,133 +391,142 @@ form label.error {
 }
 
 /* AI Analysis Tab Styles */
-.ai-analysis-container {
-    padding: 0px;
-}
-
-.ai-analysis-accordion-list {
-    padding: 0 0 0 20px;
-    margin: 20px 0 0 0;
-}
-
-.ai-analysis-accordion-item {
-    margin-bottom: 8px;
-    border-radius: 6px;
-    overflow: hidden;
-}
-
-.ai-analysis-accordion-header {
-    display: flex;
-    align-items: center;
-    padding: 12px 16px;
-    cursor: pointer;
-    border-left: 4px solid;
-    background-color: #f8f9fa;
-    transition: background-color 0.2s ease;
-    position: relative;
-}
-
-.ai-analysis-accordion-header:hover {
-    background-color: #e9ecef;
-}
-
-.ai-analysis-accordion-header.error {
-    border-left-color: #dc3545;
-    background-color: #f8d7da;
-}
-
-.ai-analysis-accordion-header.error:hover {
-    background-color: #f1b5bb;
-}
-
-.ai-analysis-accordion-header.warning {
-    border-left-color: #ffc107;
-    background-color: #fff3cd;
-}
-
-.ai-analysis-accordion-header.warning:hover {
-    background-color: #ffe69c;
-}
-
-.ai-analysis-accordion-header.info {
-    border-left-color: #0dcaf0;
-    background-color: #cff4fc;
-}
-
-.ai-analysis-accordion-header.info:hover {
-    background-color: #9eeaf9;
-}
-
-.ai-analysis-accordion-arrow {
-    margin-right: 12px;
-    transition: transform 0.3s ease;
-    flex-shrink: 0;
-}
-
-.ai-analysis-accordion-arrow::before {
-    content: ' ';
-    display: block;
-    border-bottom: 1px solid #313132;
-    border-right: 1px solid #313132;
-    height: 10px;
-    width: 10px;
-    transform: rotate(45deg);
-    transition: all 0.3s;
-}
-
-.ai-analysis-accordion-icon {
-    margin-right: 12px;
-    font-size: 18px;
-    flex-shrink: 0;
-}
-
-.ai-analysis-accordion-header.error .ai-analysis-accordion-icon {
-    color: #721c24;
-}
-
-.ai-analysis-accordion-header.warning .ai-analysis-accordion-icon {
-    color: #856404;
-}
-
-.ai-analysis-accordion-header.info .ai-analysis-accordion-icon {
-    color: #055160;
-}
-
-.ai-analysis-accordion-title {
-    flex: 1;
-    font-weight: 650;
-    font-size: 16px;
-    color: #212529;
-}
-
-.ai-analysis-accordion-header.active .ai-analysis-accordion-arrow::before {
-    transform: rotate(-135deg);
-}
-
-.ai-analysis-accordion-body {
-    padding: 16px 20px 16px 46px;
-    background-color: #ffffff;
-    border-left: 4px solid;
-    border-top: 1px solid #dee2e6;
-    display: none;
-    color: #495057;
-    font-size: 14px;
-    line-height: 1.6;
-}
-
-.ai-analysis-accordion-body.error {
-    border-left-color: #dc3545;
-}
-
-.ai-analysis-accordion-body.warning {
-    border-left-color: #ffc107;
-}
-
-.ai-analysis-accordion-body.info {
-    border-left-color: #0dcaf0;
-}
-
-.ai-analysis-detail-item {
+.ai-analysis-container {
+    padding: 0;
+}
+
+.ai-analysis-status-badge {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 999px;
+    padding: 4px 10px;
+    font-size: 12px;
+    font-weight: 700;
+    width: auto;
+    min-width: 0;
+    border: 1px solid transparent;
+    background-image: none;
+}
+
+.ai-analysis-status-badge.proceed {
+    background-color: #d1e7dd;
+    color: #0f5132;
+}
+
+.ai-analysis-status-badge.hold {
+    background-color: #f8d7da;
+    color: #842029;
+}
+
+.ai-analysis-recommendation-rationale {
+    color: #495057;
+    font-size: 14px;
+    line-height: 1.6;
+}
+
+.ai-analysis-sections {
+    margin-top: 16px;
+}
+
+.ai-analysis-section {
+    border: 1px solid #dce3ec;
+    border-radius: 8px;
+    overflow: hidden;
+    margin-bottom: 16px;
+}
+
+.ai-analysis-section-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 12px 12px;
+    border-left: 4px solid;
+    min-height: 52px;
+}
+
+.ai-analysis-section.error .ai-analysis-section-header {
+    border-left-color: #dc3545;
+    background-color: #f8d7da;
+}
+
+.ai-analysis-section.warning .ai-analysis-section-header {
+    border-left-color: #ffc107;
+    background-color: #fff3cd;
+}
+
+.ai-analysis-section.summary .ai-analysis-section-header {
+    border-left-color: #0dcaf0;
+    background-color: #cff4fc;
+}
+
+.ai-analysis-section.next-steps .ai-analysis-section-header {
+    border-left-color: #198754;
+    background-color: #d1e7dd;
+}
+
+.ai-analysis-section.recommendation .ai-analysis-section-header {
+    border-left-color: #6c757d;
+    background-color: #f8f9fa;
+}
+
+.ai-analysis-section-title-row {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.ai-analysis-section-icon {
+    margin-right: 0;
+    font-size: 16px;
+    flex-shrink: 0;
+}
+
+.ai-analysis-section.error .ai-analysis-section-icon {
+    color: #721c24;
+}
+
+.ai-analysis-section.warning .ai-analysis-section-icon {
+    color: #856404;
+}
+
+.ai-analysis-section.summary .ai-analysis-section-icon {
+    color: #055160;
+}
+
+.ai-analysis-section.next-steps .ai-analysis-section-icon {
+    color: #0f5132;
+}
+
+.ai-analysis-section.recommendation .ai-analysis-section-icon {
+    color: #5c6b7a;
+}
+
+.ai-analysis-section-title {
+    font-weight: 650;
+    font-size: 16px;
+    color: #212529;
+}
+
+.ai-analysis-section-body {
+    padding: 12px 14px;
+    background-color: #ffffff;
+    border-top: 1px solid #dee2e6;
+    color: #495057;
+    font-size: 14px;
+    line-height: 1.6;
+}
+
+.ai-analysis-section.compact .ai-analysis-section-body {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.ai-analysis-section.header-only .ai-analysis-section-body {
+    display: none;
+}
+
+.ai-analysis-detail-item {
     margin-bottom: 16px;
     padding-bottom: 16px;
     border-bottom: 1px solid #e9ecef;
@@ -554,60 +563,95 @@ form label.error {
     margin-bottom: 6px;
 }
 
-.ai-analysis-dismiss-btn,
-.ai-analysis-restore-btn {
-    background: none;
-    border: none;
-    padding: 4px 8px;
-    cursor: pointer;
-    color: #6c757d;
-    font-size: 14px;
-    transition: color 0.2s, background-color 0.2s;
-    border-radius: 4px;
-    flex-shrink: 0;
-}
-
-.ai-analysis-dismiss-btn i,
-.ai-analysis-restore-btn i {
-    pointer-events: none;
-}
-
-.ai-analysis-dismiss-btn:hover {
-    color: #dc3545;
-    background-color: #f8d7da;
-}
-
-.ai-analysis-restore-btn:hover {
-    color: #0d6efd;
-    background-color: #cfe2ff;
-}
-
-.ai-analysis-detail-item.dismissed {
-    opacity: 0.6;
-    background-color: #f8f9fa;
-    padding: 12px;
-    border-radius: 4px;
-}
-
-.ai-analysis-detail-item.dismissed .ai-analysis-detail-category {
-    color: #6c757d;
-}
-
-.ai-analysis-detail-item.dismissed .ai-analysis-detail-message {
-    color: #6c757d;
-}
-
-.ai-analysis-accordion-header.dismissed {
-    border-left-color: #6c757d;
-    background-color: #f8f9fa;
-}
-
-.ai-analysis-accordion-body.dismissed {
-    background-color: #f8f9fa;
-}
-
-.ai-analysis-empty {
-    text-align: center;
-    padding: 40px;
-    color: #6c757d;
-}
+.ai-analysis-detail-item.hidden-item {
+    opacity: 0.6;
+}
+
+.ai-analysis-section-toggle {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 132px;
+    padding: 4px 10px;
+    font-size: 13px;
+    font-weight: 600;
+    color: #4b5563;
+    background-color: #ffffff;
+    border: 1px solid #d1d5db;
+    border-radius: 6px;
+    text-decoration: none;
+}
+
+.ai-analysis-section-toggle:disabled {
+    cursor: default;
+    pointer-events: none;
+    opacity: 1;
+}
+
+.ai-analysis-section-toggle:hover {
+    color: #1f2937;
+    background-color: #f9fafb;
+    border-color: #9ca3af;
+}
+
+.ai-analysis-status-chip {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 4px 10px;
+    font-size: 12px;
+    font-weight: 700;
+    color: #5c6b7a;
+    background-color: #eef2f6;
+    border: 1px solid #dce3ec;
+    border-radius: 999px;
+}
+
+#ai-analysis-tab {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+}
+
+.ai-analysis-tab-icon-wrap {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.ai-analysis-tab-indicator {
+    width: 8px;
+    height: 8px;
+    border-radius: 999px;
+    background-color: #adb5bd;
+    flex-shrink: 0;
+}
+
+.ai-analysis-tab-indicator.proceed {
+    background-color: #198754;
+}
+
+.ai-analysis-tab-indicator.hold {
+    background-color: #ffc107;
+}
+
+.ai-analysis-action-btn {
+    background: #ffffff;
+    border: 1px solid #d1d5db;
+    padding: 4px 10px;
+    cursor: pointer;
+    color: #4b5563;
+    font-size: 13px;
+    font-weight: 600;
+    transition: color 0.2s, background-color 0.2s, border-color 0.2s;
+    border-radius: 6px;
+    flex-shrink: 0;
+    line-height: 1.2;
+}
+
+.ai-analysis-action-btn:hover {
+    color: #1f2937;
+    background-color: #f9fafb;
+    border-color: #9ca3af;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index dac9c5d75d..c173d70141 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -621,11 +621,18 @@ $(function () {
         );
     });
     
-    PubSub.subscribe('update_ai_analysis_count', (msg, data) => {
-        if (data.itemCount || data.itemCount === 0) {
-            tabCounters.ai_analysis = data.itemCount;
+    PubSub.subscribe('update_ai_analysis_status', (msg, data) => {
+        const $indicator = $('#ai_analysis_status');
+        const status = data?.status;
+
+        $indicator.removeClass('proceed hold');
+
+        if (status === 'proceed' || status === 'hold') {
+            $indicator.addClass(status).show();
+            return;
         }
-        $('#ai_analysis_count').html(tabCounters.ai_analysis);
+
+        $indicator.hide();
     });
 
     PubSub.subscribe('update_application_emails_count', (msg, data) => {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
index 9de9b4752a..344c647be8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
@@ -8,6 +8,7 @@ $(function () {
     const formatter = createNumberFormatter();
     const l = abp.localization.getResource('GrantManager');
     const defaultQuickDateRange = 'last6months';
+    const guidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 
     let dt = $('#GrantApplicationsTable');
     let dataTable;
@@ -425,7 +426,6 @@ $(function () {
                 initialLoad = false; // Reset flag after use
             }
         });
-        dataTable.on('search.dt', () => handleSearch());
 
         dataTable.on('select', function (e, dt, type, indexes) {
 
@@ -495,10 +495,6 @@ $(function () {
         }
     }
 
-    function handleSearch() {
-        let filter = $('.dt-search input').val();
-    }
-
     function getColumns() {
         let columnIndex = 1;
         const sortedColumns = [
@@ -581,7 +577,28 @@ $(function () {
             data: 'applicant.applicantName',
             name: 'applicantName',
             className: 'data-table-header',
-            index: columnIndex
+            index: columnIndex,
+            render: function(data, type, row) {
+                let applicantName = (typeof data !== 'string' || data.trim() === '') ? '(Unknown Applicant)' : data;
+
+                if (type === 'sort' || type === 'filter') { 
+                    return applicantName;
+                }
+
+                if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applicants.ViewList')) {
+                    const safeApplicantName = $.fn.dataTable.render.text().display(applicantName);
+                    const applicantId = row?.applicant?.id;
+                    const isGuid = applicantId && guidPattern.test(applicantId);
+
+                    if (isGuid) {
+                        return `<a href="/GrantApplicants/Details?ApplicantId=${encodeURIComponent(applicantId)}">${safeApplicantName}</a>`;
+                    }
+
+                    return safeApplicantName;
+                }
+
+                return applicantName;
+            },
         }
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js
index ece7839f1f..8abd07a076 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js
@@ -1,63 +1,45 @@
 /**
  * AI Analysis module for Grant Applications
- * Handles rendering and management of AI-generated analysis results
+ * Renders a stable sectioned view for AI-generated analysis results.
  */
 
-/**
- * Helper function to create an item from a template
- * @param {string} templateName - Name of the template to clone
- * @param {Object} data - Data to populate the template with
- * @returns {jQuery} Cloned and populated element
- */
+const hiddenSectionVisibility = {
+    error: false,
+    warning: false,
+    summary: false,
+    nextStep: false
+};
+
+function bindTemplateAction($element, actionData) {
+    $element.attr('data-id', actionData.id).attr('data-type', actionData.type);
+}
+
+function bindTemplateValue($item, key, value) {
+    const $element = $item.find(`[data-element="${key}"]`);
+    if ($element.length === 0) {
+        return;
+    }
+
+    if (key === 'hide-btn' || key === 'show-btn') {
+        bindTemplateAction($element, value);
+        return;
+    }
+
+    if (key === 'icon') {
+        $element.addClass(value);
+        return;
+    }
+
+    $element.text(value);
+}
+
 function createItemFromTemplate(templateName, data) {
     const $template = $(`[data-template="${templateName}"]`).first();
     const $item = $template.clone().removeAttr('data-template');
-    
-    // Populate the template with data
-    Object.keys(data).forEach(key => {
-        const $element = $item.find(`[data-element="${key}"]`);
-        if ($element.length) {
-            if (key === 'dismiss-btn' || key === 'restore-btn') {
-                $element.attr('data-id', data[key].id).attr('data-type', data[key].type);
-                if (key === 'dismiss-btn') {
-                    $element.attr('title', `Dismiss this ${data[key].type}`);
-                } else {
-                    $element.attr('title', `Restore this ${data[key].type}`);
-                }
-            } else if (key === 'icon') {
-                $element.addClass(data[key]);
-            } else {
-                $element.text(data[key]);
-            }
-        }
-    });
-    
-    return $item;
-}
 
-/**
- * Helper function to create an accordion group
- * @param {string} id - Unique ID for the accordion
- * @param {string} type - Type class to add
- * @param {string} iconClass - Icon class
- * @param {string} title - Title text
- * @param {jQuery} content - Content to append
- * @returns {jQuery} Complete accordion group element
- */
-function createAccordionGroup(id, type, iconClass, title, content) {
-    const $group = createItemFromTemplate('accordion-group', {
-        icon: iconClass,
-        title: title
-    });
-    
-    const $header = $group.find('[data-element="header"]');
-    const $body = $group.find('[data-element="body"]');
-    
-    $header.addClass(type).attr('data-target', id);
-    $body.addClass(type).attr('id', id);
-    $body.append(content);
-    
-    return $group;
+    Object.entries(data).forEach(([key, value]) => bindTemplateValue($item, key, value));
+
+    return $item;
 }
 
 function getFindingDetailText(item) {
@@ -77,291 +59,402 @@ function getFindingDetailText(item) {
     }
 }
 
-function getVisibleIssueCount(activeWarnings, activeErrors, summaries) {
-    return activeWarnings.length + activeErrors.length + summaries.length;
+function updateAnalysisTabStatus(recommendation) {
+    let status = '';
+    if (recommendation) {
+        status = recommendation.decision === 'PROCEED' ? 'proceed' : 'hold';
+    }
+
+    PubSub.publish('update_ai_analysis_status', {
+        status: status
+    });
 }
 
-function renderRealAIAnalysis(analysisData) {
-    const rawWarnings = analysisData.warnings || [];
-    const rawErrors = analysisData.errors || [];
-    const rawSummaries = analysisData.summaries || analysisData.recommendations || [];
-    const warnings = rawWarnings
-        .filter(w => w)
-        .map((w, i) => ({
-            ...w,
-            id: w.id || `warning-${i}`,
-            title: w.title || w.category || 'Warning',
-            detail: w.detail || w.message || ''
-        }));
-    const errors = rawErrors
-        .filter(e => e)
-        .map((e, i) => ({
-            ...e,
-            id: e.id || `error-${i}`,
-            title: e.title || e.category || 'Error',
-            detail: e.detail || e.message || ''
+function normalizeFindings(items, fallbackType) {
+    const fallbackTitles = {
+        error: 'Error',
+        warning: 'Warning',
+        summary: 'Summary',
+        nextStep: 'Next step'
+    };
+
+    return (items || [])
+        .filter(item => item)
+        .map((item, index) => ({
+            ...item,
+            id: item.id || `${fallbackType}-${index}`,
+            hidden: item.hidden === true,
+            title: item.title || item.category || fallbackTitles[fallbackType] || 'Item',
+            detail: item.detail || item.message || ''
         }));
-    const summaries = rawSummaries.map((s) => ({
-        title: s?.title || s?.category || 'Summary',
-        detail: s?.detail || s?.message || s || ''
-    }));
-    const dismissedItems = new Set((analysisData.dismissed || analysisData.dismissed_items || []).filter(Boolean));
-
-    // Get all valid IDs from current errors and warnings
-    const allValidIds = new Set([...errors.map(e => e.id), ...warnings.map(w => w.id)]);
-
-    // Filter dismissed items to only include IDs that exist in current errors/warnings
-    const validDismissedItems = new Set(
-        Array.from(dismissedItems).filter(id => allValidIds.has(id))
-    );
+}
 
-    // Separate active and dismissed items
-    const activeErrors = errors.filter(e => !validDismissedItems.has(e.id));
-    const activeWarnings = warnings.filter(w => !validDismissedItems.has(w.id));
-    const dismissedErrors = errors.filter(e => validDismissedItems.has(e.id));
-    const dismissedWarnings = warnings.filter(w => validDismissedItems.has(w.id));
-
-    // Clear existing accordion list and rebuild
-    const $accordionList = $('#aiAnalysisAccordionList');
-    $accordionList.empty();
-
-    // Add errors section if there are any
-    if (activeErrors.length > 0) {
-        const errorItems = activeErrors.map(error => {
-            return createItemFromTemplate('dismissible-item', {
-                category: error.title || 'Error',
-                message: getFindingDetailText(error),
-                'dismiss-btn': { id: error.id, type: 'error' }
-            });
-        });
+function normalizeRecommendation(recommendation) {
+    if (!recommendation || typeof recommendation !== 'object') {
+        return null;
+    }
+
+    const decision = typeof recommendation.decision === 'string'
+        ? recommendation.decision.trim().toUpperCase()
+        : '';
+    const rationale = typeof recommendation.rationale === 'string'
+        ? recommendation.rationale.trim()
+        : '';
 
-        const $errorsContainer = $('<div>');
-        errorItems.forEach(item => $errorsContainer.append(item));
-        
-        const accordionItem = createAccordionGroup(
-            'errors',
-            'error',
-            'fl-times-circle',
-            `Errors (${activeErrors.length})`,
-            $errorsContainer
-        );
-        $accordionList.append(accordionItem);
+    if (decision !== 'PROCEED' && decision !== 'HOLD') {
+        return null;
     }
 
-    // Add warnings section if there are any
-    if (activeWarnings.length > 0) {
-        const warningItems = activeWarnings.map(warning => {
-            return createItemFromTemplate('dismissible-item', {
-                category: warning.title || 'Warning',
-                message: getFindingDetailText(warning),
-                'dismiss-btn': { id: warning.id, type: 'warning' }
-            });
-        });
+    return {
+        decision: decision,
+        rationale: rationale
+    };
+}
 
-        const $warningsContainer = $('<div>');
-        warningItems.forEach(item => $warningsContainer.append(item));
-        
-        const accordionItem = createAccordionGroup(
-            'warnings',
-            'warning',
-            'fl-exclamation-triangle',
-            `Warnings (${activeWarnings.length})`,
-            $warningsContainer
-        );
-        $accordionList.append(accordionItem);
+function createFindingItem(item, type, hidden) {
+    const templateName = hidden ? 'hidden-item' : 'active-item';
+    const actionKey = hidden ? 'show-btn' : 'hide-btn';
+    return createItemFromTemplate(templateName, {
+        category: item.title,
+        message: getFindingDetailText(item),
+        [actionKey]: { id: item.id, type: type }
+    });
+}
+
+function renderSection(section) {
+    const $section = createItemFromTemplate('section', {
+        icon: section.icon,
+        title: section.title
+    });
+
+    $section.addClass(section.sectionClass);
+    if (section.activeItems.length === 0) {
+        $section.addClass('compact');
     }
 
-    // Add summary section if there are any
-    if (summaries.length > 0) {
-        const summaryItems = summaries.map(rec => {
-            const category = typeof rec === 'object' ? (rec.title || 'Summary') : 'Summary';
-            const message = typeof rec === 'object' ? getFindingDetailText(rec) : rec;
-            
-            return createItemFromTemplate('summary-item', {
-                category: category,
-                message: message
-            });
+    const $items = $section.find('[data-element="items"]');
+    const $status = $section.find('[data-element="status-chip"]');
+    const $toggle = $section.find('[data-element="hidden-toggle"]');
+    const hiddenCount = section.hiddenItems.length;
+    const isHiddenVisible = hiddenSectionVisibility[section.itemType] === true;
+
+    if (section.headerOnlyText) {
+        $section.addClass('header-only');
+        $status
+            .addClass('ai-analysis-status-chip')
+            .text(section.headerOnlyText)
+            .show();
+        $toggle.hide();
+        return $section;
+    }
+
+    if (section.activeItems.length > 0 || hiddenCount > 0) {
+        section.allItems.forEach(item => {
+            const isHidden = item.hidden === true;
+            const $item = createFindingItem(item, section.itemType, isHidden);
+            if (isHidden && !isHiddenVisible) {
+                $item.hide();
+            }
+
+            $items.append($item);
         });
+    }
 
-        const $summaryContainer = $('<div>');
-        summaryItems.forEach(item => $summaryContainer.append(item));
-        
-        const accordionItem = createAccordionGroup(
-            'summary',
-            'info',
-            'fl-info-circle',
-            `Summary (${summaries.length})`,
-            $summaryContainer
-        );
-        $accordionList.append(accordionItem);
+    if (hiddenCount > 0) {
+        $toggle
+            .css('visibility', 'visible')
+            .text(isHiddenVisible
+                ? 'Hide hidden items'
+                : 'Show hidden items')
+            .prop('disabled', false)
+            .show()
+            .off('click')
+            .on('click', function() {
+                const shouldShow = hiddenSectionVisibility[section.itemType] !== true;
+                hiddenSectionVisibility[section.itemType] = shouldShow;
+                $items.find('.hidden-item').toggle(shouldShow);
+                $toggle.text(
+                    shouldShow
+                        ? 'Hide hidden items'
+                        : 'Show hidden items'
+                );
+            });
+    } else {
+        hiddenSectionVisibility[section.itemType] = false;
+        $toggle
+            .text('Show hidden items')
+            .css('visibility', 'hidden')
+            .prop('disabled', true)
+            .show();
     }
 
-    // Add dismissed items section if there are any
-    if (dismissedErrors.length > 0 || dismissedWarnings.length > 0) {
-        const dismissedItems = [
-            ...dismissedErrors.map(error => {
-                return createItemFromTemplate('dismissed-item', {
-                    category: error.title || 'Error',
-                    message: getFindingDetailText(error),
-                    'restore-btn': { id: error.id, type: 'error' }
-                });
-            }),
-            ...dismissedWarnings.map(warning => {
-                return createItemFromTemplate('dismissed-item', {
-                    category: warning.title || 'Warning',
-                    message: getFindingDetailText(warning),
-                    'restore-btn': { id: warning.id, type: 'warning' }
-                });
-            })
-        ];
-
-        const $dismissedContainer = $('<div>');
-        dismissedItems.forEach(item => $dismissedContainer.append(item));
-        
-        const accordionItem = createAccordionGroup(
-            'dismissed',
-            'dismissed',
-            'fl-eye-slash',
-            `Dismissed Items (${dismissedErrors.length + dismissedWarnings.length})`,
-            $dismissedContainer
-        );
-
-        $accordionList.append(accordionItem);
+    return $section;
+}
+
+function renderRecommendationSection(recommendation) {
+    if (!recommendation) {
+        return null;
     }
 
-    const totalLength = getVisibleIssueCount(activeWarnings, activeErrors, summaries);
-    PubSub.publish('update_ai_analysis_count', {
-        itemCount: totalLength,
+    const shouldProceed = recommendation.decision === 'PROCEED';
+    const $section = createItemFromTemplate('section', {
+        icon: 'fl-info-circle',
+        title: 'Recommendation'
     });
 
-    // If no items, show the no-data message; otherwise hide it
-    const $noDataMessage = $('#aiAnalysisNoData');
-    if (activeErrors.length === 0 && activeWarnings.length === 0 && summaries.length === 0 && dismissedErrors.length === 0 && dismissedWarnings.length === 0) {
-        $noDataMessage.show();
-        $accordionList.hide();
-    } else {
-        $noDataMessage.hide();
-        $accordionList.show();
-    }
+    $section.addClass('recommendation compact');
+    $section.find('[data-element="status-chip"]')
+        .addClass('ai-analysis-status-badge')
+        .addClass(shouldProceed ? 'proceed' : 'hold')
+        .text(shouldProceed ? 'Proceed' : 'Hold')
+        .show();
+    $section.find('[data-element="hidden-toggle"]').remove();
+    $section.find('[data-element="items"]').append(
+        $('<div class="ai-analysis-recommendation-rationale"></div>')
+            .text(recommendation.rationale || 'No rationale provided.')
+    );
 
-    // Update tab badge with total count
-    const totalIssues = getVisibleIssueCount(activeWarnings, activeErrors, summaries);
-    $('#ai-analysis-tab').html(`<i class="fa-solid fa-wand-sparkles" aria-hidden="true"></i>(${totalIssues})`);
+    return $section;
+}
 
-    // Remove all previous event handlers from accordion list
-    $accordionList.off('click');
+function splitFindingsByVisibility(items) {
+    return {
+        activeItems: items.filter(item => item.hidden !== true),
+        hiddenItems: items.filter(item => item.hidden === true)
+    };
+}
 
-    // Use event delegation for dismiss buttons (highest priority)
-    $accordionList.on('click', '.ai-analysis-dismiss-btn', function(e) {
+function buildAnalysisSections(analysisData) {
+    const recommendation = normalizeRecommendation(analysisData.recommendation);
+    const errors = normalizeFindings(analysisData.errors, 'error');
+    const warnings = normalizeFindings(analysisData.warnings, 'warning');
+    const summaries = normalizeFindings(analysisData.summaries || analysisData.recommendations, 'summary');
+    const nextSteps = normalizeFindings(analysisData.nextSteps, 'nextStep');
+    const errorGroups = splitFindingsByVisibility(errors);
+    const warningGroups = splitFindingsByVisibility(warnings);
+    const summaryGroups = splitFindingsByVisibility(summaries);
+    const nextStepGroups = splitFindingsByVisibility(nextSteps);
+
+    return {
+        recommendation,
+        sections: [
+            {
+                title: 'Errors',
+                icon: 'fl-times-circle',
+                sectionClass: 'error',
+                itemType: 'error',
+                headerOnlyText: errorGroups.activeItems.length === 0 && errorGroups.hiddenItems.length === 0 ? 'No errors' : null,
+                activeItems: errorGroups.activeItems,
+                allItems: errors,
+                hiddenItems: errorGroups.hiddenItems
+            },
+            {
+                title: 'Warnings',
+                icon: 'fl-exclamation-triangle',
+                sectionClass: 'warning',
+                itemType: 'warning',
+                headerOnlyText: warningGroups.activeItems.length === 0 && warningGroups.hiddenItems.length === 0 ? 'No warnings' : null,
+                activeItems: warningGroups.activeItems,
+                allItems: warnings,
+                hiddenItems: warningGroups.hiddenItems
+            },
+            {
+                title: 'Summary',
+                icon: 'fl-info-circle',
+                sectionClass: 'summary',
+                itemType: 'summary',
+                headerOnlyText: summaryGroups.activeItems.length === 0 && summaryGroups.hiddenItems.length === 0 ? 'No summary' : null,
+                activeItems: summaryGroups.activeItems,
+                allItems: summaries,
+                hiddenItems: summaryGroups.hiddenItems
+            },
+            {
+                title: 'Next Steps',
+                icon: 'fl-check-square',
+                sectionClass: 'next-steps',
+                itemType: 'nextStep',
+                headerOnlyText: nextStepGroups.activeItems.length === 0 && nextStepGroups.hiddenItems.length === 0 ? 'No next steps' : null,
+                activeItems: nextStepGroups.activeItems,
+                allItems: nextSteps,
+                hiddenItems: nextStepGroups.hiddenItems
+            }
+        ]
+    };
+}
+
+function hasAnyAnalysisContent(recommendation, sections) {
+    if (recommendation) {
+        return true;
+    }
+
+    return sections.some(section => section.allItems.length > 0);
+}
+
+function bindAnalysisItemActions($sections) {
+    $sections.off('click');
+    $sections.on('click', '[data-element="hide-btn"]', function(e) {
         e.preventDefault();
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-        const issueId = $(this).data('id');
-        dismissAIIssue(issueId);
-        return false;
+        const itemId = $(this).data('id');
+        hideAnalysisItem(itemId);
     });
 
-    // Use event delegation for restore buttons (highest priority)
-    $accordionList.on('click', '.ai-analysis-restore-btn', function(e) {
+    $sections.on('click', '[data-element="show-btn"]', function(e) {
         e.preventDefault();
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-        const issueId = $(this).data('id');
-        restoreAIIssue(issueId);
-        return false;
+        const itemId = $(this).data('id');
+        showAnalysisItem(itemId);
     });
+}
 
-    // Add click event listener for accordion headers - check if target is not a button
-    $accordionList.on('click', '.ai-analysis-accordion-header', function(e) {
-        // Don't toggle if clicking on buttons or their children
-        if ($(e.target).closest('.ai-analysis-dismiss-btn, .ai-analysis-restore-btn').length === 0) {
-            toggleAccordionItem($(this));
-        }
+function renderRealAIAnalysis(analysisData) {
+    const { recommendation, sections } = buildAnalysisSections(analysisData);
+    const $sections = $('#aiAnalysisSections');
+    $sections.empty();
+    const $recommendationSection = renderRecommendationSection(recommendation);
+    const hasRecommendation = $recommendationSection !== null;
+    if ($recommendationSection) {
+        $sections.append($recommendationSection);
+    }
+
+    sections.forEach(section => {
+        $sections.append(renderSection(section));
     });
+
+    updateAnalysisTabStatus(recommendation);
+
+    const $noDataMessage = $('#aiAnalysisNoData');
+    if (!hasRecommendation && !hasAnyAnalysisContent(recommendation, sections)) {
+        $noDataMessage.show();
+        $sections.hide();
+    } else {
+        $noDataMessage.hide();
+        $sections.show();
+    }
+
+    bindAnalysisItemActions($sections);
 }
 
-globalThis.dismissAIIssue = function(issueId) {
+globalThis.hideAnalysisItem = function(itemId) {
     const applicationId = $('#DetailsViewApplicationId').val();
 
     unity.grantManager.grantApplications.grantApplication
-        .dismissAIIssue(applicationId, issueId)
-        .then(function(updatedAnalysis) {
-            // Reload the AI analysis section with updated data
+        .hideAIAnalysisItem(applicationId, itemId)
+        .then(function() {
             loadAIAnalysis();
         })
-        .catch(function(error) {
-            abp.message.error('Failed to dismiss the issue. Please try again.');
+        .catch(function() {
+            abp.message.error('Failed to hide the item. Please try again.');
         });
 }
 
-globalThis.restoreAIIssue = function(issueId) {
+globalThis.showAnalysisItem = function(itemId) {
     const applicationId = $('#DetailsViewApplicationId').val();
 
     unity.grantManager.grantApplications.grantApplication
-        .restoreAIIssue(applicationId, issueId)
-        .then(function(updatedAnalysis) {
-            // Reload the AI analysis section with updated data
+        .showAIAnalysisItem(applicationId, itemId)
+        .then(function() {
             loadAIAnalysis();
         })
-        .catch(function(error) {
-            abp.message.error('Failed to restore the issue. Please try again.');
+        .catch(function() {
+            abp.message.error('Failed to show the item. Please try again.');
         });
 }
 
-function toggleAccordionItem($header) {
-    const targetId = $header.attr('data-target');
-    const $body = $('#' + targetId);
+function resetAnalysisView() {
+    $('#aiAnalysisSections').empty().hide();
+    $('#aiAnalysisNoData').show();
+    updateAnalysisTabStatus(null);
+}
 
-    // Toggle active class on header
-    $header.toggleClass('active');
+function tryParseRawAnalysis(analysisJson) {
+    if (!analysisJson) {
+        return null;
+    }
 
-    // Toggle body visibility
-    $body.slideToggle(300);
+    try {
+        let cleaned = String(analysisJson).trim();
+        if (cleaned.startsWith('```json') || cleaned.startsWith('```')) {
+            const firstBreak = cleaned.indexOf('\n');
+            if (firstBreak >= 0) {
+                cleaned = cleaned.substring(firstBreak + 1);
+            }
+        }
+
+        if (cleaned.endsWith('```')) {
+            cleaned = cleaned.substring(0, cleaned.lastIndexOf('```'));
+        }
+
+        cleaned = cleaned.replaceAll(/,(\s*[}\]])/g, '$1').trim();
+        return JSON.parse(cleaned);
+    } catch (parseError) {
+        console.warn('Failed to parse aiAnalysis JSON fallback:', parseError);
+        return null;
+    }
+}
+
+globalThis.regenerateAIAnalysis = function() {
+    const applicationId = $('#DetailsViewApplicationId').val();
+    const $button = $('#regenerateAiAnalysis');
+    const existingHtml = $button.html();
+
+    if (!applicationId || $button.prop('disabled')) {
+        return;
+    }
+
+    $button
+        .html('<span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span> Refreshing Analysis...')
+        .prop('disabled', true);
+
+    unity.grantManager.grantApplications.applicationAIAnalysis
+        .generateAIAnalysis(applicationId)
+        .then(function() {
+            abp.notify.success('AI analysis refreshed successfully.');
+            loadAIAnalysis();
+        })
+        .catch(function() {
+            abp.message.error('Failed to refresh AI analysis. Please try again.');
+        })
+        .always(function() {
+            $button.html(existingHtml).prop('disabled', false);
+        });
 }
 
 function loadAIAnalysis() {
     if ($('#AIAnalysisFeatureEnabled').val() === 'False') {
         return;
     }
+
     const urlParams = new URL(globalThis.location.toLocaleString()).searchParams;
     const applicationId = urlParams.get('ApplicationId');
-
     if (!applicationId) {
         return;
     }
 
-    // Get the application data including AI analysis
     unity.grantManager.grantApplications.grantApplication.get(applicationId)
         .done(function(application) {
-            let aiAnalysisData = application.aiAnalysisData;
-            if (!aiAnalysisData && application.aiAnalysis) {
-                try {
-                    let cleaned = String(application.aiAnalysis).trim();
-                    if (cleaned.startsWith('```json') || cleaned.startsWith('```')) {
-                        const firstBreak = cleaned.indexOf('\n');
-                        if (firstBreak >= 0) {
-                            cleaned = cleaned.substring(firstBreak + 1);
-                        }
-                    }
-                    if (cleaned.endsWith('```')) {
-                        cleaned = cleaned.substring(0, cleaned.lastIndexOf('```'));
-                    }
-                    cleaned = cleaned.replaceAll(/,(\s*[}\]])/g, '$1').trim();
-                    aiAnalysisData = JSON.parse(cleaned);
-                } catch (parseError) {
-                    console.warn('Failed to parse aiAnalysis JSON fallback:', parseError);
-                }
-            }
+            const aiAnalysisData = application?.aiAnalysisData ?? tryParseRawAnalysis(application?.aiAnalysis);
 
-            if (application && aiAnalysisData) {
+            if (aiAnalysisData) {
                 try {
                     renderRealAIAnalysis(aiAnalysisData);
-                } catch (e) {
-                    console.warn('Failed to render AI analysis data:', e);
+                } catch (error) {
+                    console.warn('Failed to render AI analysis data:', error);
+                    resetAnalysisView();
                 }
+            } else {
+                resetAnalysisView();
             }
         })
         .fail(function(error) {
             console.warn('Failed to load application data', error);
+            resetAnalysisView();
         });
 }
+
+$(function() {
+    const $regenerateButton = $('#regenerateAiAnalysis');
+    if ($regenerateButton.length > 0) {
+        $regenerateButton.on('click', function() {
+            regenerateAIAnalysis();
+        });
+    }
+});
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Unity.GrantManager.Web.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Unity.GrantManager.Web.csproj
index 7849bfb978..f01ec57688 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Unity.GrantManager.Web.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Unity.GrantManager.Web.csproj
@@ -25,6 +25,7 @@
     <ProjectReference Include="..\..\modules\Unity.Notifications\src\Unity.Notifications.Web\Unity.Notifications.Web.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Payments\src\Unity.Payments.Web\Unity.Payments.Web.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Reporting\src\Unity.Reporting.Web\Unity.Reporting.Web.csproj" />
+    <ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Web\Unity.AI.Web.csproj" />
     <ProjectReference Include="..\..\modules\Unity.SharedKernel\Unity.SharedKernel.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Theme.UX2\src\Unity.Theme.UX2\Unity.AspNetCore.Mvc.UI.Theme.UX2.csproj" /></ItemGroup>
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewComponent.cs
index 1a5df2a4d7..d825bbccf6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewComponent.cs
@@ -9,6 +9,7 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Domain.Repositories;
 
 
 namespace Unity.GrantManager.Web.Views.Shared.Components.ApplicantAddresses
@@ -23,15 +24,18 @@ public class ApplicantAddressesViewComponent : AbpViewComponent
         private readonly IApplicantAddressRepository _applicantAddressRepository;
         private readonly IApplicantAgentRepository _applicantAgentRepository;
         private readonly IPermissionChecker _permissionChecker;
+        private readonly IRepository<Application, Guid> _applicationRepository;
 
         public ApplicantAddressesViewComponent(
             IApplicantAddressRepository applicantAddressRepository,
             IApplicantAgentRepository applicantAgentRepository,
-            IPermissionChecker permissionChecker)
+            IPermissionChecker permissionChecker,
+            IRepository<Application, Guid> applicationRepository)
         {
             _applicantAddressRepository = applicantAddressRepository;
             _applicantAgentRepository = applicantAgentRepository;
             _permissionChecker = permissionChecker;
+            _applicationRepository = applicationRepository;
         }
 
         public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
@@ -41,10 +45,6 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                 return View(new ApplicantAddressesViewModel { ApplicantId = applicantId });
             }
 
-            
-            // Load addresses using repository method
-            // Note: The repository method returns addresses without Application navigation property loaded
-            // We'll handle null Application gracefully in the mapping
             var addresses = await _applicantAddressRepository.FindByApplicantIdAsync(applicantId);
             var agents = await _applicantAgentRepository.GetListByApplicantIdAsync(applicantId);
 
@@ -56,6 +56,20 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                 .OrderByDescending(a => a.LastModificationTime ?? a.CreationTime)
                 .ToList();
 
+            var appIds = new HashSet<Guid>(
+                orderedAddresses.Where(a => a.ApplicationId.HasValue).Select(a => a.ApplicationId!.Value)
+                    .Concat(orderedAgents.Where(a => a.ApplicationId.HasValue).Select(a => a.ApplicationId!.Value)));
+
+            var appRefMap = new Dictionary<Guid, string>();
+            if (appIds.Count > 0)
+            {
+                var apps = await _applicationRepository.GetListAsync(a => appIds.Contains(a.Id));
+                foreach (var app in apps)
+                {
+                    appRefMap[app.Id] = app.ReferenceNo;
+                }
+            }
+
             var viewModel = new ApplicantAddressesViewModel
             {
                 ApplicantId = applicantId,
@@ -65,7 +79,9 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                     .Select(a => new ApplicantAddressItemDto
                     {
                         Id = a.Id,
-                        AddressType = GetAddressTypeName(a.AddressType),                        
+                        AddressType = GetAddressTypeName(a.AddressType),
+                        ApplicationId = a.ApplicationId,
+                        ReferenceNo = a.ApplicationId.HasValue ? appRefMap.GetValueOrDefault(a.ApplicationId.Value, string.Empty) : string.Empty,
                         Street = a.Street ?? string.Empty,
                         Street2 = a.Street2 ?? string.Empty,
                         Unit = a.Unit ?? string.Empty,
@@ -85,7 +101,9 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                             : agent.Phone2 ?? string.Empty,
                         Title = agent.Title ?? string.Empty,
                         Type = index == 0 ? "Primary" : "",
-                        CreationTime = agent.CreationTime
+                        CreationTime = agent.CreationTime,
+                        ApplicationId = agent.ApplicationId,
+                        ReferenceNo = agent.ApplicationId.HasValue ? appRefMap.GetValueOrDefault(agent.ApplicationId.Value, string.Empty) : string.Empty
                     })
                     .ToList()
             };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewModel.cs
index 42ad849d56..7fcdfb4d94 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/ApplicantAddressesViewModel.cs
@@ -61,6 +61,8 @@ public class ApplicantContactItemDto
         public string Title { get; set; } = string.Empty;
         public string Type { get; set; } = string.Empty;
         public DateTime CreationTime { get; set; }
+        public string ReferenceNo { get; set; } = string.Empty;
+        public Guid? ApplicationId { get; set; }
     }
 
     public class ApplicantAddressItemDto
@@ -68,6 +70,7 @@ public class ApplicantAddressItemDto
         public Guid Id { get; set; }
         public string AddressType { get; set; } = string.Empty;
         public string ReferenceNo { get; set; } = string.Empty;
+        public Guid? ApplicationId { get; set; }
         public string Street { get; set; } = string.Empty;
         public string Street2 { get; set; } = string.Empty;
         public string Unit { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.cshtml
index f2fce5518e..bbbf8ed279 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.cshtml
@@ -18,176 +18,191 @@
     }
     else
     {
-        @if (Model.CanSave)
-        {
-            <div class="save-button-container">
-                <abp-button text="Save"
-                            id="saveApplicantAddressesBtn"
-                            class="floating-save-btn"
-                            icon-type="Other"
-                            icon="fl fl-save"
-                            button-type="Primary"
-                            disabled="true" />
-            </div>
-        }
-
         <form id="ApplicantAddressesForm" autocomplete="off" class="applicant-organization-info">
             <input type="hidden" id="ApplicantAddresses_ApplicantId" value="@Model.ApplicantId" />
             <input type="hidden" id="ApplicantAddresses_PrimaryContactId" value="@Model.PrimaryContact.Id" />
             <input type="hidden" id="ApplicantAddresses_PrimaryPhysicalAddressId" value="@Model.PrimaryPhysicalAddress.Id" />
             <input type="hidden" id="ApplicantAddresses_PrimaryMailingAddressId" value="@Model.PrimaryMailingAddress.Id" />
 
-            <div class="primary-sections">
-                <section class="primary-section">
-                    <div class="primary-section__title fw-bold">Primary Contact</div>
-                    <div class="primary-section__body">
-                        <div class="row g-3">
-                            <div class="col-md-4">
-                                <abp-input asp-for="PrimaryContact.FullName"
-                                           id="PrimaryContact_FullName"
-                                           disabled="@(!canEditPrimaryContact)" />
-                            </div>
-                            <div class="col-md-4">
-                                <abp-input asp-for="PrimaryContact.Title"
-                                           id="PrimaryContact_Title"
-                                           disabled="@(!canEditPrimaryContact)" />
-                            </div>
-                            <div class="col-md-4">
-                                <abp-input asp-for="PrimaryContact.Email"
-                                           type="email"
-                                           id="PrimaryContact_Email"
-                                           disabled="@(!canEditPrimaryContact)" />
-                            </div>
-                            <div class="col-md-4">
-                                <abp-input asp-for="PrimaryContact.BusinessPhone"
-                                           id="PrimaryContact_BusinessPhone"
-                                           disabled="@(!canEditPrimaryContact)" />
-                            </div>
-                            <div class="col-md-4">
-                                <abp-input asp-for="PrimaryContact.CellPhone"
-                                           id="PrimaryContact_CellPhone"
-                                           disabled="@(!canEditPrimaryContact)" />
-                            </div>
-                        </div>
-                        @if (!Model.PrimaryContact.IsEditable)
-                        {
-                            <div class="text-muted mt-3 small">No primary contact on record.</div>
-                        }
+            <div class="sub-tab-header">
+                <div class="nav nav-tabs"
+                     id="contactsAddressesSubTabs"
+                     role="tablist"
+                     aria-label="Applicant contacts and addresses tabs">
+                    <div class="nav-item">
+                        <button class="nav-link active"
+                                id="contacts-sub-tab"
+                                data-bs-toggle="tab"
+                                data-bs-target="#contactsSubTabPane"
+                                type="button"
+                                role="tab"
+                                aria-controls="contactsSubTabPane"
+                                aria-selected="true">Contacts</button>
                     </div>
-                </section>
+                    <div class="nav-item">
+                        <button class="nav-link"
+                                id="addresses-sub-tab"
+                                data-bs-toggle="tab"
+                                data-bs-target="#addressesSubTabPane"
+                                type="button"
+                                role="tab"
+                                aria-controls="addressesSubTabPane"
+                                aria-selected="false">Addresses</button>
+                    </div>
+                </div>
+                @if (Model.CanSave)
+                {
+                    <abp-button text="Save"
+                                id="saveApplicantAddressesBtn"
+                                class="floating-save-btn"
+                                icon-type="Other"
+                                icon="fl fl-save"
+                                button-type="Primary"
+                                disabled="true" />
+                }
+            </div>
 
-                <section class="primary-section">
-                    <div class="primary-section__title fw-bold">Primary Physical Address</div>
-                    <div class="primary-section__body">
-                        <div class="row g-3">
-                            <div class="col-md-6">
-                                <abp-input asp-for="PrimaryPhysicalAddress.Street"
-                                           id="PrimaryPhysicalAddress_Street"
-                                           disabled="@(!canEditPrimaryPhysical)" />
-                            </div>
-                            <div class="col-md-6">
-                                <abp-input asp-for="PrimaryPhysicalAddress.Street2"
-                                           id="PrimaryPhysicalAddress_Street2"
-                                           disabled="@(!canEditPrimaryPhysical)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryPhysicalAddress.Unit"
-                                           id="PrimaryPhysicalAddress_Unit"
-                                           disabled="@(!canEditPrimaryPhysical)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryPhysicalAddress.City"
-                                           id="PrimaryPhysicalAddress_City"
-                                           disabled="@(!canEditPrimaryPhysical)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryPhysicalAddress.Province"
-                                           id="PrimaryPhysicalAddress_Province"
-                                           disabled="@(!canEditPrimaryPhysical)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryPhysicalAddress.PostalCode"
-                                           id="PrimaryPhysicalAddress_PostalCode"
-                                           disabled="@(!canEditPrimaryPhysical)" />
-                            </div>
+            <div class="tab-content">
+                <!-- Contacts Pane -->
+                <div class="tab-pane fade show active" id="contactsSubTabPane" role="tabpanel" aria-labelledby="contacts-sub-tab">
+                    <section class="primary-section">
+                        <div class="primary-section__title fw-bold">Primary Contact</div>
+                        <div class="primary-section__body">
+                            <div class="row g-3">
+                                <div class="col-md-4">
+                                    <abp-input asp-for="PrimaryContact.FullName"
+                                               id="PrimaryContact_FullName"
+                                               disabled="@(!canEditPrimaryContact)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <abp-input asp-for="PrimaryContact.Title"
+                                               id="PrimaryContact_Title"
+                                               disabled="@(!canEditPrimaryContact)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <abp-input asp-for="PrimaryContact.Email"
+                                               type="email"
+                                               id="PrimaryContact_Email"
+                                               disabled="@(!canEditPrimaryContact)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <abp-input asp-for="PrimaryContact.BusinessPhone"
+                                               id="PrimaryContact_BusinessPhone"
+                                               disabled="@(!canEditPrimaryContact)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <abp-input asp-for="PrimaryContact.CellPhone"
+                                               id="PrimaryContact_CellPhone"
+                                               disabled="@(!canEditPrimaryContact)" />
+                                </div>
+                            </div>
+                            @if (!Model.PrimaryContact.IsEditable)
+                            {
+                                <div class="text-muted mt-3 small">No primary contact on record.</div>
+                            }
+                        </div>
+                    </section>
+
+                    <div class="table-card mt-3">
+                        <div class="table-card__header">
+                            <h6 class="fw-bold mb-0">Contacts</h6>
+                        </div>
+                        <div class="table-card__body">
+                            <abp-table id="ApplicantContactsTable"
+                                       hoverable-rows="true"
+                                       data-resize-aware="true"
+                                       class="contacts-table">
+                            </abp-table>
                         </div>
-                        @if (!Model.PrimaryPhysicalAddress.IsEditable)
-                        {
-                            <div class="text-muted mt-3 small">No primary physical address on record.</div>
-                        }
                     </div>
-                </section>
+                </div>
 
-                <section class="primary-section">
-                    <div class="primary-section__title fw-bold">Primary Mailing Address</div>
-                    <div class="primary-section__body">
-                        <div class="row g-3">
-                            <div class="col-md-6">
-                                <abp-input asp-for="PrimaryMailingAddress.Street"
-                                           id="PrimaryMailingAddress_Street"
-                                           disabled="@(!canEditPrimaryMailing)" />
-                            </div>
-                            <div class="col-md-6">
-                                <abp-input asp-for="PrimaryMailingAddress.Street2"
-                                           id="PrimaryMailingAddress_Street2"
-                                           disabled="@(!canEditPrimaryMailing)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryMailingAddress.Unit"
-                                           id="PrimaryMailingAddress_Unit"
-                                           disabled="@(!canEditPrimaryMailing)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryMailingAddress.City"
-                                           id="PrimaryMailingAddress_City"
-                                           disabled="@(!canEditPrimaryMailing)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryMailingAddress.Province"
-                                           id="PrimaryMailingAddress_Province"
-                                           disabled="@(!canEditPrimaryMailing)" />
-                            </div>
-                            <div class="col-md-3">
-                                <abp-input asp-for="PrimaryMailingAddress.PostalCode"
-                                           id="PrimaryMailingAddress_PostalCode"
-                                           disabled="@(!canEditPrimaryMailing)" />
-                            </div>
+                <!-- Addresses Pane -->
+                <div class="tab-pane fade" id="addressesSubTabPane" role="tabpanel" aria-labelledby="addresses-sub-tab">
+                    <div class="d-flex">
+                        <div class="row m-0 physical-address-form pe-2" style="border-bottom:none;">
+                            <div class="row m-0 p-0">
+                                <div class="col-12 d-inline-flex justify-content-between pb-3 pt-2 ps-0 mt-3">
+                                    <div class="d-flex align-items-stretch justify-content-start">
+                                        <h6 class="ps-1 fw-bold">Primary Physical Address</h6>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-0 p-0">
+                                <div class="col-5 px-1">
+                                    <abp-input asp-for="PrimaryPhysicalAddress.Street" id="PrimaryPhysicalAddress_Street" disabled="@(!canEditPrimaryPhysical)" />
+                                </div>
+                                <div class="col-5 px-1">
+                                    <abp-input asp-for="PrimaryPhysicalAddress.Street2" id="PrimaryPhysicalAddress_Street2" disabled="@(!canEditPrimaryPhysical)" />
+                                </div>
+                                <div class="col-2 px-1">
+                                    <abp-input asp-for="PrimaryPhysicalAddress.Unit" id="PrimaryPhysicalAddress_Unit" disabled="@(!canEditPrimaryPhysical)" />
+                                </div>
+                                <div class="col-4 px-1">
+                                    <abp-input asp-for="PrimaryPhysicalAddress.City" id="PrimaryPhysicalAddress_City" disabled="@(!canEditPrimaryPhysical)" />
+                                </div>
+                                <div class="col-4 px-1">
+                                    <abp-input asp-for="PrimaryPhysicalAddress.Province" id="PrimaryPhysicalAddress_Province" disabled="@(!canEditPrimaryPhysical)" />
+                                </div>
+                                <div class="col-4 px-1">
+                                    <abp-input asp-for="PrimaryPhysicalAddress.PostalCode" id="PrimaryPhysicalAddress_PostalCode" disabled="@(!canEditPrimaryPhysical)" />
+                                </div>
+                            </div>
+                            @if (!Model.PrimaryPhysicalAddress.IsEditable)
+                            {
+                                <div class="text-muted mt-3 small">No primary physical address on record.</div>
+                            }
+                        </div>
+                        <div class="row m-0 mailing-address-form ps-2" style="border-bottom:none;">
+                            <div class="row m-0 p-0">
+                                <div class="col-12 d-inline-flex justify-content-between pb-3 pt-2 ps-0 mt-3">
+                                    <div class="d-flex align-items-stretch justify-content-start">
+                                        <h6 class="ps-1 fw-bold">Primary Mailing Address</h6>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-0 p-0">
+                                <div class="col-5 px-1">
+                                    <abp-input asp-for="PrimaryMailingAddress.Street" id="PrimaryMailingAddress_Street" disabled="@(!canEditPrimaryMailing)" />
+                                </div>
+                                <div class="col-5 px-1">
+                                    <abp-input asp-for="PrimaryMailingAddress.Street2" id="PrimaryMailingAddress_Street2" disabled="@(!canEditPrimaryMailing)" />
+                                </div>
+                                <div class="col-2 px-1">
+                                    <abp-input asp-for="PrimaryMailingAddress.Unit" id="PrimaryMailingAddress_Unit" disabled="@(!canEditPrimaryMailing)" />
+                                </div>
+                                <div class="col-4 px-1">
+                                    <abp-input asp-for="PrimaryMailingAddress.City" id="PrimaryMailingAddress_City" disabled="@(!canEditPrimaryMailing)" />
+                                </div>
+                                <div class="col-4 px-1">
+                                    <abp-input asp-for="PrimaryMailingAddress.Province" id="PrimaryMailingAddress_Province" disabled="@(!canEditPrimaryMailing)" />
+                                </div>
+                                <div class="col-4 px-1">
+                                    <abp-input asp-for="PrimaryMailingAddress.PostalCode" id="PrimaryMailingAddress_PostalCode" disabled="@(!canEditPrimaryMailing)" />
+                                </div>
+                            </div>
+                            @if (!Model.PrimaryMailingAddress.IsEditable)
+                            {
+                                <div class="text-muted mt-3 small">No primary mailing address on record.</div>
+                            }
                         </div>
-                        @if (!Model.PrimaryMailingAddress.IsEditable)
-                        {
-                            <div class="text-muted mt-3 small">No primary mailing address on record.</div>
-                        }
                     </div>
-                </section>
-            </div>
-        </form>
 
-        <div class="contacts-addresses-tables">
-            <div class="table-card">
-                <div class="table-card__header">
-                    <h6 class="fw-bold mb-0">Contacts</h6>
-                </div>
-                <div class="table-card__body">
-                    <abp-table id="ApplicantContactsTable"
-                               hoverable-rows="true"
-                               data-resize-aware="true"
-                               class="contacts-table">
-                    </abp-table>
-                </div>
-            </div>
-            <div class="table-card">
-                <div class="table-card__header">
-                    <h6 class="fw-bold mb-0">Addresses</h6>
-                </div>
-                <div class="table-card__body">
-                    <abp-table id="ApplicantAddressesTable"
-                               hoverable-rows="true"
-                               data-resize-aware="true"
-                               class="addresses-table">
-                    </abp-table>
+                    <div class="table-card mt-3">
+                        <div class="table-card__header">
+                            <h6 class="fw-bold mb-0">Addresses</h6>
+                        </div>
+                        <div class="table-card__body">
+                            <abp-table id="ApplicantAddressesTable"
+                                       hoverable-rows="true"
+                                       data-resize-aware="true"
+                                       class="addresses-table">
+                            </abp-table>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
+        </form>
     }
 </div>
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.css
index d6f31385ec..f97cbb6740 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.css
@@ -2,6 +2,11 @@
 
 .applicant-addresses-widget {
     position: relative;
+    height: 100%;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
 }
 
 .applicant-info-container {
@@ -9,24 +14,32 @@
     position: relative;
 }
 
-.applicant-info-container .save-button-container {
+.applicant-organization-info {
+    border-radius: 8px;
+    padding: 0 1rem 1rem 1rem;
+    margin-bottom: 0;
     display: flex;
-    justify-content: flex-end;
-    position: sticky;
-    top: 50px;
-    padding-right: 24px;
-    z-index: 999;
+    flex-direction: column;
+    height: 100%;
+    min-height: 0;
+    overflow: hidden;
 }
 
-.applicant-info-container .floating-save-btn {
-    min-width: 120px;
-    position: static;
+.sub-tab-header {
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    margin-bottom: 0.25rem;
 }
 
-.applicant-organization-info {
-    border-radius: 8px;
-    padding: 1rem;
-    margin-bottom: 1rem;
+.sub-tab-header .nav-tabs {
+    flex: 1;
+    border-bottom: none;
+}
+
+.sub-tab-header .floating-save-btn {
+    min-width: 120px;
+    margin-bottom: 4px;
 }
 
 .applicant-organization-info .form-label {
@@ -38,11 +51,6 @@
     margin-bottom: 0;
 }
 
-.primary-sections {
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
 
 .primary-section {
     padding-bottom: 1rem;
@@ -59,10 +67,27 @@
     color: #1f2933;
 }
 
-.contacts-addresses-tables {
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
+.tab-content > .tab-pane {
+    padding-top: 0.5rem;
+}
+
+.applicant-organization-info > .tab-content {
+    flex: 1;
+    min-height: 0;
+    overflow: hidden;
+}
+
+.applicant-organization-info > .tab-content > .tab-pane {
+    height: 100%;
+    min-height: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+
+#contactsSubTabPane,
+#addressesSubTabPane {
+    overflow-y: auto;
+    overflow-x: hidden;
 }
 
 .table-card {
@@ -79,6 +104,7 @@
 
 .table-card__body {
     padding: 1.25rem;
+    overflow: visible;
 }
 
 .addresses-table,
@@ -89,11 +115,16 @@
 #ApplicantAddressesTable_wrapper,
 #ApplicantContactsTable_wrapper {
     width: 100%;
+    overflow: visible !important;
 }
 
+#ApplicantAddressesTable_wrapper .dt-container,
+#ApplicantContactsTable_wrapper .dt-container,
 #ApplicantAddressesTable_wrapper .dt-scroll,
-#ApplicantContactsTable_wrapper .dt-scroll {
-    overflow: visible;
+#ApplicantContactsTable_wrapper .dt-scroll,
+#ApplicantAddressesTable_wrapper .dt-layout-row,
+#ApplicantContactsTable_wrapper .dt-layout-row {
+    overflow: visible !important;
 }
 
 #ApplicantAddressesTable_wrapper .dt-scroll-head .dt-scroll-headInner,
@@ -119,3 +150,12 @@
 #ApplicantContactsTable {
     width: 100% !important;
 }
+
+.physical-address-form {
+    border-right: 0.25rem solid var(--bc-colors-white-background);
+    flex: 1;
+}
+
+.mailing-address-form {
+    flex: 1;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.js
index ece8dc55e1..8e0c4348c4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAddresses/Default.js
@@ -1,4 +1,5 @@
 $(function () {
+    const LAYOUT_NOTIFICATION_DELAYS = [0, 120, 300, 700];
     const contactsRaw = $('#ApplicantContacts_Data').val();
     const addressesRaw = $('#ApplicantAddresses_Data').val();
     const contactsData = safeParse(contactsRaw);
@@ -9,62 +10,26 @@ $(function () {
     let addressesTable = null;
     let zoneForm = null;
 
-    if ($.fn.DataTable && $('#ApplicantContactsTable').length) {
-        contactsTable = $('#ApplicantContactsTable').DataTable(
-            abp.libs.datatables.normalizeConfiguration({
-                data: contactsData,
-                serverSide: false,
-                order: [[0, 'asc']],
-                searching: true,
-                paging: true,
-                pageLength: 10,
-                lengthMenu: [[10, 25, 50], [10, 25, 50]],
-                select: false,
-                info: true,
-                scrollX: true,
-                drawCallback: function () {
-                    this.api().columns.adjust();
-                },
-                columnDefs: [
-                    {
-                        title: 'Name',
-                        data: 'name',
-                        width: '20%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Email',
-                        data: 'email',
-                        width: '25%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Phone',
-                        data: 'phone',
-                        width: '15%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Title',
-                        data: 'title',
-                        width: '20%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Type',
-                        data: 'type',
-                        width: '10%',
-                        render: (data) => data || nullPlaceholder
-                    }
-                ]
-            })
-        );
+    function notifyApplicantAddressesLayoutChange() {
+        window.dispatchEvent(new CustomEvent('applicant-addresses-layout-changed'));
     }
 
-    if ($.fn.DataTable && $('#ApplicantAddressesTable').length) {
-        addressesTable = $('#ApplicantAddressesTable').DataTable(
+    function renderTableLink(data, row) {
+        if (!data || !row.applicationId) {
+            return nullPlaceholder;
+        }
+
+        return `<a href="/GrantApplications/Details?ApplicationId=${row.applicationId}">${data}</a>`;
+    }
+
+    function initializeApplicantTable(selector, data, columnDefs, extraConfig = {}) {
+        if (!$.fn.DataTable || !$(selector).length) {
+            return null;
+        }
+
+        return $(selector).DataTable(
             abp.libs.datatables.normalizeConfiguration({
-                data: addressesData,
+                data: data,
                 serverSide: false,
                 order: [[0, 'asc']],
                 searching: true,
@@ -76,48 +41,123 @@ $(function () {
                 drawCallback: function () {
                     this.api().columns.adjust();
                 },
-                columnDefs: [
-                    {
-                        title: 'Address Type',
-                        data: 'addressType',
-                        width: '15%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Address',
-                        data: 'street',
-                        width: '25%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Unit',
-                        data: 'unit',
-                        width: '10%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'City',
-                        data: 'city',
-                        width: '15%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Province',
-                        data: 'province',
-                        width: '15%',
-                        render: (data) => data || nullPlaceholder
-                    },
-                    {
-                        title: 'Postal Code',
-                        data: 'postal',
-                        width: '10%',
-                        render: (data) => data || nullPlaceholder
-                    }
-                ]
+                ...extraConfig,
+                columnDefs: columnDefs
             })
         );
     }
 
+    function scheduleLayoutNotifications() {
+        LAYOUT_NOTIFICATION_DELAYS.forEach((delay) => {
+            setTimeout(notifyApplicantAddressesLayoutChange, delay);
+        });
+    }
+
+    contactsTable = initializeApplicantTable(
+        '#ApplicantContactsTable',
+        contactsData,
+        [
+            {
+                title: 'Name',
+                data: 'name',
+                width: '18%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Email',
+                data: 'email',
+                width: '22%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Phone',
+                data: 'phone',
+                width: '13%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Title',
+                data: 'title',
+                width: '17%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Type',
+                data: 'type',
+                width: '10%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Submission #',
+                data: 'referenceNo',
+                width: '15%',
+                render: (data, type, row) => renderTableLink(data, row)
+            }
+        ],
+        {
+            lengthMenu: [[10, 25, 50], [10, 25, 50]]
+        }
+    );
+
+    addressesTable = initializeApplicantTable(
+        '#ApplicantAddressesTable',
+        addressesData,
+        [
+            {
+                title: 'Address Type',
+                data: 'addressType',
+                width: '13%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Address',
+                data: 'street',
+                width: '22%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Unit',
+                data: 'unit',
+                width: '8%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'City',
+                data: 'city',
+                width: '14%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Province',
+                data: 'province',
+                width: '14%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Postal Code',
+                data: 'postal',
+                width: '10%',
+                render: (data) => data || nullPlaceholder
+            },
+            {
+                title: 'Submission #',
+                data: 'referenceNo',
+                width: '13%',
+                render: (data, type, row) => renderTableLink(data, row)
+            }
+        ]
+    );
+
+    $('#contactsAddressesSubTabs button').on('shown.bs.tab', function (e) {
+        const target = $(e.target).data('bsTarget');
+        if (target === '#contactsSubTabPane' && contactsTable) contactsTable.columns.adjust().draw(false);
+        if (target === '#addressesSubTabPane' && addressesTable) addressesTable.columns.adjust().draw(false);
+        notifyApplicantAddressesLayoutChange();
+        requestAnimationFrame(() => notifyApplicantAddressesLayoutChange());
+    });
+
+    scheduleLayoutNotifications();
+
     const form = $('#ApplicantAddressesForm');
     const saveButton = $('#saveApplicantAddressesBtn');
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.css
index eec357fcbf..b2d06369a4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.css
@@ -65,7 +65,7 @@
 #FundingHistoryTable_wrapper .dt-scroll-body,
 #IssueTrackingTable_wrapper .dt-scroll-body,
 #AuditHistoryTable_wrapper .dt-scroll-body {
-    max-height: 350px !important;
+    max-height: clamp(180px, calc(100vh - 540px), 350px) !important;
     overflow-y: auto !important;
     overflow-x: auto !important;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.css
index 7a017fac31..8cf2c2928a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.css
@@ -3,10 +3,12 @@
 .applicant-submissions-widget {
     background-color: #fff;
     border-radius: 4px;
-    height: 100%;
+    height: auto;
+    min-height: 0;
     display: flex;
     flex-direction: column;
     padding: 1rem;
+    box-sizing: border-box;
 }
 
 .submissions-action-bar {
@@ -35,6 +37,7 @@
 .submissions-table-container {
     margin-top: 1rem;
     flex: 1;
+    min-height: 0;
     position: relative;
     overflow: visible !important;
 }
@@ -116,6 +119,7 @@
 /* Make Submissions widget fill available space */
 #SubmissionsWidget {
     padding: 0 !important;
+    min-height: 0;
 }
 
 /* DataTable wrapper - allow all content to be visible */
@@ -125,6 +129,7 @@
 
 /* DataTable container - allow all content to be visible */
 .applicant-submissions-widget .dt-container {
+    min-height: 0;
     overflow: visible !important;
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.js
index 525bda3206..d0ab490685 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.js
@@ -1,4 +1,6 @@
 $(function () {
+    const LAYOUT_NOTIFICATION_DELAYS = [0, 120, 280, 600];
+
     // Check if createNumberFormatter exists
     if (typeof createNumberFormatter !== 'function') {
         console.error('createNumberFormatter is not defined. Ensure table-utils.js is loaded before this script');
@@ -26,7 +28,7 @@ $(function () {
     };
 
     // Action buttons configuration
-    let actionButtons = [
+    const actionButtons = [
         {
             text: 'Filter',
             className: 'custom-table-btn flex-none btn btn-secondary',
@@ -46,7 +48,7 @@ $(function () {
     const listColumns = getColumns();
 
     // Response callback - same pattern as Application List
-    let responseCallback = function (result) {
+    const responseCallback = function (result) {
         return {
             recordsTotal: result.totalCount,
             recordsFiltered: result.totalCount,
@@ -54,7 +56,7 @@ $(function () {
         };
     };
 
-    let formatItems = function (items) {
+    const formatItems = function (items) {
         const newData = items.map((item, index) => {
             return {
                 ...item,
@@ -68,7 +70,7 @@ $(function () {
     // Must return a jQuery Deferred object (not native Promise) for ABP compatibility
     const mockDataService = {
         getList: function() {
-            let deferred = $.Deferred();
+            const deferred = $.Deferred();
             deferred.resolve({
                 items: submissionsData,
                 totalCount: submissionsData.length
@@ -97,6 +99,13 @@ $(function () {
         dynamicButtonContainerId: 'submissionsDynamicButtonContainerId'
     });
 
+    function notifySubmissionsLayoutChange() {
+        window.dispatchEvent(new CustomEvent('applicant-submissions-layout-changed'));
+    }
+
+    scheduleLayoutNotifications();
+    bindLayoutNotificationEvents();
+
     // External search binding
     dataTable.externalSearch('#submissions-search', { delay: 300 });
 
@@ -126,6 +135,16 @@ $(function () {
     // Initialize button state
     updateOpenButtonState();
 
+    function scheduleLayoutNotifications() {
+        LAYOUT_NOTIFICATION_DELAYS.forEach((delay) => {
+            setTimeout(notifySubmissionsLayoutChange, delay);
+        });
+    }
+
+    function bindLayoutNotificationEvents() {
+        dataTable.on('draw', notifySubmissionsLayoutChange);
+    }
+
     // Column getter functions (from Application List)
     function getColumns() {
         let columnIndex = 0;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidget.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidget.cs
index f229ac79d7..42ae522e40 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidget.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidget.cs
@@ -26,6 +26,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId)
 
             return View(new ApplicationBreadcrumbWidgetViewModel()
             {
+                ApplicantId = applicationApplicant.ApplicantId,
                 ApplicantName = applicationApplicant.ApplicantName,
                 ApplicationStatus = applicationApplicant.ApplicationStatus,
                 ReferenceNo = applicationApplicant.ApplicationReferenceNo,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidgetViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidgetViewModel.cs
index 4ad298762c..5a664ddc66 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidgetViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/ApplicationBreadcrumbWidgetViewModel.cs
@@ -5,6 +5,7 @@ namespace Unity.GrantManager.Web.Views.Shared.Components.ApplicationBreadcrumbWi
     public class ApplicationBreadcrumbWidgetViewModel
     {        
         public string ReferenceNo { get; set; } = string.Empty;
+        public Guid ApplicantId { get; set; } = Guid.Empty;
         public string ApplicantName { get; set; } = string.Empty;
         public string ApplicationStatus { get; set; } = string.Empty;
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.cshtml
index bd60256de7..bcd5438836 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.cshtml
@@ -1,12 +1,33 @@
-@using Unity.GrantManager.Web.Views.Shared.Components.ApplicationBreadcrumbWidget;
+@using Unity.GrantManager.Permissions
+@using Unity.GrantManager.Web.Views.Shared.Components.ApplicationBreadcrumbWidget;
+@using Volo.Abp.Authorization.Permissions
+
+@inject IPermissionChecker PermissionChecker
 
 @model ApplicationBreadcrumbWidgetViewModel
 
+@{
+    var renderedApplicantName = string.IsNullOrWhiteSpace(Model.ApplicantName) ? "Unknown Applicant" : Model.ApplicantName;
+    var hasViewPermission = await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.Applicants.ViewList);
+}
+
 <div class="breadcrumb-container">
     <abp-button icon="fl fl-arrow-left" icon-type="Other" id="goBack" class="px-2" ></abp-button>
     <div class="application-details-breadcrumb">
         <div class="reference-no">@Model.ReferenceNo</div>
-        <div class="applicant-name">@Model.ApplicantName</div>
+        <div class="applicant-name">
+            @if (hasViewPermission && Model.ApplicantId != Guid.Empty)
+            {
+                <a href="~/GrantApplicants/Details?ApplicantId=@Model.ApplicantId" 
+                   class="applicant-name-link link-underline link-offset-1 link-underline-opacity-0 link-underline-opacity-100-hover">
+                    @renderedApplicantName
+                </a>
+            }
+            else
+            {
+                @renderedApplicantName
+            }
+        </div>
         <div class="form-version pr-1">@Model.SubmissionFormDescription</div>
         <div class="application-status">@Model.ApplicationStatus</div>    
     </div>
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 5e9142ac52..b613bd2d39 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
@@ -20,6 +20,7 @@
         @if (Model.Scoresheet.Sections.Any())
         {
             <div class="d-flex justify-content-end mb-3 scoresheet-top-btn-group">
+                <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="regenerateAiScoresheetBtn" onclick="regenerateAIScoresheetAnswers()"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>Refresh Scoring</button>
                 <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" onclick="expandAllAccordions('assessment-scoresheet')"><i class="unt-icon-sm fa-solid fa-angles-down"></i>Expand All</button>
                 <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" onclick="collapseAllAccordions('assessment-scoresheet')"><i class="unt-icon-sm fa-solid fa-angles-up"></i>Collapse All</button>
             </div>
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 a3dae7c2a3..9b1194b2a1 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
@@ -576,3 +576,34 @@ function collapseAllAccordions(divId) {
             .classList.add('collapsed');
     });
 }
+
+function regenerateAIScoresheetAnswers() {
+    const applicationId = $('#DetailsViewApplicationId').val();
+    const $button = $('#regenerateAiScoresheetBtn');
+    const existingHtml = $button.html();
+
+    if (!applicationId || $button.prop('disabled')) {
+        return;
+    }
+
+    $button
+        .html(
+            '<span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>Refreshing Scoring...'
+        )
+        .prop('disabled', true);
+
+    unity.grantManager.grantApplications.applicationAIScoring
+        .generateAIScoresheetAnswers(applicationId)
+        .done(function () {
+            abp.notify.success('AI scoring refreshed successfully.');
+            PubSub.publish('refresh_assessment_scores', null);
+        })
+        .fail(function () {
+            abp.message.error(
+                'Failed to refresh AI scoring. Please try again.'
+            );
+        })
+        .always(function () {
+            $button.html(existingHtml).prop('disabled', false);
+        });
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.cs
index 57d32cff70..530a0338fd 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Volo.Abp.Features;
 using Volo.Abp.Authorization.Permissions;
-using Unity.GrantManager.Permissions;
+using Unity.AI.Permissions;
 
 namespace Unity.GrantManager.Web.Views.Shared.Components.ChefsAttachments
 {
@@ -29,7 +29,7 @@ public async Task<IViewComponentResult> InvokeAsync()
         {
             var isAIAttachmentSummariesEnabled =
                 await _featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries") &&
-                await _permissionChecker.IsGrantedAsync(GrantApplicationPermissions.AI.AttachmentSummary.Default);
+                await _permissionChecker.IsGrantedAsync(AIPermissions.AttachmentSummary.AttachmentSummaryDefault);
             ViewBag.IsAIAttachmentSummariesEnabled = isAIAttachmentSummariesEnabled;
             return View();
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/UserInfoWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/UserInfoWidget/Default.cshtml
index 4e7e5b93fd..1618cdc453 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/UserInfoWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/UserInfoWidget/Default.cshtml
@@ -12,7 +12,6 @@
         <div class="unity-user-initials me-2">@Model.Badge</div>
         <div>
             <div class="user-name-full">@Model.DisplayName</div>
-            <div class="user-role-full">@Model.Title</div>
         </div>
     </div>
 </div>